diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2005-11-28 21:11:57 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-11-28 21:11:57 +0000 |
| commit | 3c5687e6e457fc5c24b8aaed9f787849f567a10f (patch) | |
| tree | e5a1797f723bf300c549466afa9a9f5a2d9dacd6 | |
| parent | cfd81d3f13126f9903788d2576a7a499429844af (diff) | |
| parent | 37bfd44995253ca84065f0d4326c24ab14f2b1ae (diff) | |
merge of 6db5a6f376383e2d73ef38fa86ae25d51699b983
and 9afd2dba8f4f062cb27df95849c47aa62f3441dc
3 files changed, 13 insertions, 9 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-c7x0 index 20b44b7197..0f42642e7f 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-c7x0 @@ -228,7 +228,7 @@ CONFIG_BINFMT_MISC=m # Power management options # CONFIG_PM=y -CONFIG_PM_LEGACY=y +# CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set CONFIG_APM=y @@ -840,6 +840,7 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set CONFIG_KEYBOARD_CORGI=y +# CONFIG_KEYBOARD_TOSA is not set # CONFIG_KEYBOARD_SPITZ is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-cxx00 b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-cxx00 index b1748c9268..ad44de256e 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-cxx00 +++ b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-cxx00 @@ -216,7 +216,7 @@ CONFIG_BINFMT_MISC=m # Power management options # CONFIG_PM=y -CONFIG_PM_LEGACY=y +# CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set CONFIG_APM=y @@ -829,6 +829,7 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_CORGI is not set CONFIG_KEYBOARD_SPITZ=y +# CONFIG_KEYBOARD_TOSA is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set CONFIG_INPUT_TOUCHSCREEN=y diff --git a/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc2.bb b/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc2.bb index 9687967d92..3f90f81705 100644 --- a/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc2.bb +++ b/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc2.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r2" +PR = "r3" #DEFAULT_PREFERENCE = "-1" @@ -22,13 +22,15 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.15-rc2. ${RPSRC}/enable_iwmmxt-r0.patch;patch=1 \ ${RPSRC}/pxa_i2c_fixes-r4.patch;patch=1 \ ${RPSRC}/ide_not_removable-r0.patch;patch=1 \ - ${RPSRC}/led_core-r0.patch;patch=1 \ - ${RPSRC}/led_triggers-r0.patch;patch=1 \ + ${RPSRC}/sharpsl_pm_move-r0.patch;patch=1 \ + ${RPSRC}/led_core-r1.patch;patch=1 \ + ${RPSRC}/led_triggers-r1.patch;patch=1 \ ${RPSRC}/led_trig_timer-r0.patch;patch=1 \ - ${RPSRC}/led_zaurus-r0.patch;patch=1 \ - ${RPSRC}/led_locomo-r0.patch;patch=1 \ - ${RPSRC}/led_ide-r0.patch;patch=1 \ - ${RPSRC}/led_nand-r0.patch;patch=1 \ + ${RPSRC}/led_trig_sharpsl_pm-r0.patch;patch=1 \ + ${RPSRC}/led_zaurus-r2.patch;patch=1 \ + ${RPSRC}/led_locomo-r1.patch;patch=1 \ + ${RPSRC}/led_ide-r1.patch;patch=1 \ + ${RPSRC}/led_nand-r1.patch;patch=1 \ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ ${RPSRC}/pxa_rtc-r2.patch;patch=1 \ ${RPSRC}/input_power-r4.patch;patch=1 \ |