diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-01-05 16:03:10 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-05 16:03:10 +0000 |
| commit | 21b1ce2437e9206cebf982e0c4b6a18922b47c03 (patch) | |
| tree | 6f7c69926f012d32af9a8c375e0475032f9a9842 /packages/linux | |
| parent | 7442ac744be0d724aed5c36ae3452738f20e1c9f (diff) | |
linux-oz-2.6: Remove the line causing kernel failures on akita from the defconfig. Remove rndis patch as it break cdc_subset on c7x0.
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-cxx00 | 1 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.14+2.6.15-rc7.bb | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-cxx00 b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-cxx00 index 49e7a6bd70..698c98eeaa 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-cxx00 +++ b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc7/defconfig-cxx00 @@ -185,7 +185,6 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/hda1 rootfstype=ext3 rw fbcon=rotate:1 dyntick=enable debug" # CONFIG_XIP_KERNEL is not set # diff --git a/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc7.bb b/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc7.bb index 6bb7f40d46..b8ba47e09a 100644 --- a/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc7.bb +++ b/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc7.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r1" +PR = "r2" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -63,7 +63,6 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.15-rc2. ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \ ${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \ ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \ - ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1 \ ${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 \ @@ -80,6 +79,9 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.15-rc2. file://defconfig-cxx00 \ file://defconfig-tosa " +# Disabled until I find the reason this gives issues with cdc_subset +# ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1 \ + # These patches would really help collie/poodle but we # need someone to maintain them # ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 |