diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-20 19:33:24 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-20 19:33:24 +0000 |
| commit | 364dd693a0d3ccea4a215ea38bfe20587a330c39 (patch) | |
| tree | 9c06e58a510bddc7c81e58b155b7be0cf82d7280 /packages/linux | |
| parent | 713ffb0ef8118b1fe233a209a95c740d2885b1e1 (diff) | |
| parent | 3833d213c0eb428b3664e27e4622fbecdcb3b76e (diff) | |
merge of 595aea330d5742253d5d1cca25ea86a0c2814685
and 82bcdbbeb00c95318d566c7433ccdc8ac512737e
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.15.1.bb | 6 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.15.bb | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/packages/linux/ixp4xx-kernel_2.6.15.1.bb b/packages/linux/ixp4xx-kernel_2.6.15.1.bb index 8e120fd0df..b4cde1bf41 100644 --- a/packages/linux/ixp4xx-kernel_2.6.15.1.bb +++ b/packages/linux/ixp4xx-kernel_2.6.15.1.bb @@ -3,12 +3,12 @@ # Increment PR_CONFIG for changes to the ixp4xx-kernel specific # defconfig (do *NOT* increment anything in here for changes # to other kernel configs!) -PR_CONFIG = "0" +PR_CONFIG = "1" # # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches # applied to the kernel. -PR = "r0.${PR_CONFIG}" +PR = "r8.${PR_CONFIG}" include ixp4xx-kernel.inc @@ -21,7 +21,6 @@ IXP4XX_PATCHES += "file://11-mtdpart-redboot-config-byteswap.patch;patch=1" IXP4XX_PATCHES += "file://15-jffs2-endian-config.patch;patch=1" IXP4XX_PATCHES += "file://40-rtc-class.patch;patch=1" IXP4XX_PATCHES += "file://45-eeprom-notifier.patch;patch=1" -IXP4XX_PATCHES += "file://48-setup-byteswap-cmdline.patch;patch=1" IXP4XX_PATCHES += "file://50-nas100d-arch.patch;patch=1" IXP4XX_PATCHES += "file://55-rtc-pcf8563.patch;patch=1" IXP4XX_PATCHES += "file://60-nas100d-i2c.patch;patch=1" @@ -38,5 +37,6 @@ IXP4XX_PATCHES += "file://91-maclist.patch;patch=1" IXP4XX_PATCHES += "file://92-nas100d-maclist.patch;patch=1" IXP4XX_PATCHES += "file://92-nslu2-maclist.patch;patch=1" IXP4XX_PATCHES += "file://93-loft-maclist.patch;patch=1" +IXP4XX_PATCHES += "file://94-loft-setup.patch;patch=1" IXP4XX_PATCHES += "file://94-nas100d-setup.patch;patch=1" IXP4XX_PATCHES += "file://94-nslu2-setup.patch;patch=1" diff --git a/packages/linux/linux-openzaurus_2.6.15.bb b/packages/linux/linux-openzaurus_2.6.15.bb index 13f682cb65..8df47ef8f7 100644 --- a/packages/linux/linux-openzaurus_2.6.15.bb +++ b/packages/linux/linux-openzaurus_2.6.15.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r0" +PR = "r1" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -62,7 +62,10 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \ ${RPSRC}/alsa/alsa-soc-0.9.patch;patch=1 \ ${RPSRC}/alsa/alsa-soc-0.9-0.10rc1.patch;patch=1 \ ${RPSRC}/alsa_soc_rpupdate7-r2.patch;patch=1 \ + ${RPSRC}/alsa_akita_fix-r0.patch;patch=1 \ ${RPSRC}/pm_changes-r0.patch;patch=1 \ + ${RPSRC}/corgi-bl-generic-r0.patch;patch=1 \ + ${RPSRC}/sharpsl_pm-do-r1.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \ |