diff options
author | Richard Purdie <richard@openedhand.com> | 2005-10-10 10:41:35 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2005-10-10 10:41:35 +0000 |
commit | cbf3ef91305558fb8a59e19c5987a9e9ca22013a (patch) | |
tree | f7142e57734a8b2fac92ff758a6617d4464a82f9 /openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb | |
parent | 562d4d35878bb644cbe2b9f23ef407fd6e1e38e2 (diff) | |
download | openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.gz openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.bz2 openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.xz openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.zip |
Merge changes from mainline OE to try and keep us in sync.
git-svn-id: https://svn.o-hand.com/repos/poky@127 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb')
-rw-r--r-- | openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb b/openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb index 3b374340c..18eb8bb4a 100644 --- a/openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb +++ b/openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb @@ -32,7 +32,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ${RPSRC}/sharpsl_pm-r8.patch;patch=1 \ ${RPSRC}/corgi_pm-r3.patch;patch=1 \ ${RPSRC}/spitz_base_extras-r2.patch;patch=1 \ - ${RPSRC}/spitz_pm-r3.patch;patch=1 \ + ${RPSRC}/spitz_pm-r4.patch;patch=1 \ ${RPSRC}/spitz_kbd_fix1-r0.patch;patch=1 \ ${RPSRC}/spitzcf-r3.patch;patch=1 \ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ @@ -73,10 +73,10 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ file://dtl1_cs-add-socket-revE.patch;patch=1 \ file://connectplus-remove-ide-HACK.patch;patch=1 \ file://defconfig-c7x0 \ - file://defconfig-ipaq-pxa-2.6 \ + file://defconfig-ipaq-pxa270 \ file://defconfig-collie \ file://defconfig-poodle \ - file://defconfig-spitz \ + file://defconfig-cxx00 \ file://defconfig-tosa " # These patches would really help collie/poodle but we |