merge of 85a1c1efe7466253130cd2e2a63079154ba54454

     and c67d38b84a548cc9efa81f9371658f5c59e87e43

8 files changed, 24 insertions, 13 deletions

diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0
index f2c8c37a5d..996fba9724 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0
+++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0
@@ -920,6 +920,7 @@ CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_CORGI=y
 # CONFIG_LEDS_TOSA is not set
 CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_IDE_DISK=y
 
 #
 # Multimedia devices
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-collie b/packages/linux/linux-openzaurus-2.6.16/defconfig-collie
index e786c98b52..bfc5809f30 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-collie
+++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-collie
@@ -737,7 +737,7 @@ CONFIG_FB_SA1100=y
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
 # CONFIG_FONT_8x16 is not set
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-cxx00 b/packages/linux/linux-openzaurus-2.6.16/defconfig-cxx00
index ce2ba2c269..794ff52a88 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-cxx00
+++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-cxx00
@@ -907,6 +907,7 @@ CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_SPITZ=y
 # CONFIG_LEDS_TOSA is not set
 CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_IDE_DISK=y
 
 #
 # Multimedia devices
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.16/defconfig-poodle
index 8af0dcce11..c8c74522bd 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-poodle
+++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-poodle
@@ -844,7 +844,7 @@ CONFIG_KEYBOARD_LOCOMO=y
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
 CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_TOUCHSCREEN_CORGI is not set
+CONFIG_TOUCHSCREEN_CORGI=y
 # CONFIG_TOUCHSCREEN_GUNZE is not set
 # CONFIG_TOUCHSCREEN_ELO is not set
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
@@ -1036,7 +1036,7 @@ CONFIG_FB_PXA=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
 # CONFIG_FONT_8x16 is not set
@@ -1058,7 +1058,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_DEVICE=y
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_DEVICE=y
-CONFIG_BACKLIGHT_CORGI=y
+# CONFIG_BACKLIGHT_CORGI is not set
 
 #
 # Sound
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-qemuarm b/packages/linux/linux-openzaurus-2.6.16/defconfig-qemuarm
index 6ca081b31f..2d896af0e6 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-qemuarm
+++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-qemuarm
@@ -625,7 +625,7 @@ CONFIG_HWMON=y
 #
 # LED devices
 #
-# CONFIG_NEW_LEDS is not set
+CONFIG_NEW_LEDS=y
 
 #
 # Multimedia devices
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa
index cb3ffc5a8d..f1a5c1e1c4 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa
+++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa
@@ -919,6 +919,7 @@ CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TOSA=y
 CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_IDE_DISK=y
 
 #
 # Multimedia devices
diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc
index ad4b9b252f..74edea8df8 100644
--- a/packages/linux/linux-openzaurus.inc
+++ b/packages/linux/linux-openzaurus.inc
@@ -39,6 +39,8 @@ CMDLINE_MEM_collie = "mem=${mem}M"
 CMDLINE_ROTATE_spitz = "fbcon=rotate:1"
 CMDLINE_ROTATE_akita = "fbcon=rotate:1"
 CMDLINE_ROTATE_borzoi = "fbcon=rotate:1"
+CMDLINE_ROTATE_collie = "fbcon=rotate:1"
+CMDLINE_ROTATE_poodle = "fbcon=rotate:1"
 CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}"
 
 ###############################################################
@@ -118,8 +120,9 @@ do_compile_append() {
 do_deploy() {
         install -d ${DEPLOY_DIR_IMAGE}
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
+        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib	
 }
 
 do_deploy[dirs] = "${S}"
 
-addtask deploy before do_build after do_compile
+addtask deploy before do_package after do_install
diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb
index 26f01e6cef..bb6b50fd3d 100644
--- a/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/packages/linux/linux-openzaurus_2.6.16.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r2"
+PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -15,15 +15,15 @@ DEFAULT_PREFERENCE = "-1"
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
-           ${RPSRC}/led_core-r14.patch;patch=1 \
-           ${RPSRC}/led_triggers-r11.patch;patch=1 \
-           ${RPSRC}/led_trig_timer-r6.patch;patch=1 \
+           ${RPSRC}/led_core-r15.patch;patch=1 \
+           ${RPSRC}/led_triggers-r14.patch;patch=1 \
+           ${RPSRC}/led_trig_timer-r8.patch;patch=1 \
            ${RPSRC}/led_trig_sharpsl_pm-r5.patch;patch=1 \
            ${RPSRC}/led_zaurus-r10.patch;patch=1 \
            ${RPSRC}/led_locomo-r7.patch;patch=1 \
            ${RPSRC}/led_ixp4xx-r2.patch;patch=1 \
            ${RPSRC}/led_tosa-r5.patch;patch=1 \
-           ${RPSRC}/led_ide-r4a.patch;patch=1 \
+           ${RPSRC}/led_ide-r6.patch;patch=1 \
            ${RPSRC}/led_nand-r3.patch;patch=1 \
            ${RPSRC}/ide_end_request-r1.patch;patch=1 \
            ${RPSRC}/rtc-subsystem-library-functions.patch;patch=1 \
@@ -57,8 +57,12 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
            ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
            ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \
            ${RPSRC}/misc_fix1-r0.patch;patch=1 \
-           ${RPSRC}/corgi_bl_cleanup-r2.patch;patch=1 \
-           ${RPSRC}/corgi_bl_generic-r2.patch;patch=1 \
+           ${RPSRC}/corgi_bl_cleanup-r3.patch;patch=1 \
+           ${RPSRC}/corgi_bl_generic-r3.patch;patch=1 \
+           ${RPSRC}/w100_accel1-r0.patch;patch=1 \
+           ${RPSRC}/poodle_partsize-r0.patch;patch=1 \
+           ${RPSRC}/poodle_memsize-r0.patch;patch=1 \
+           ${RPSRC}/collie_frontlight-r1.patch;patch=1 \
            ${RPSRC}/pm_changes-r1.patch;patch=1 \
            ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \
            ${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \
@@ -66,6 +70,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
 	   ${DOSRC}/kexec-arm-r2.patch;patch=1 \
            ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
            ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \
+           ${RPSRC}/poodle_ts_hack-r0.patch;patch=1 \
            file://add-oz-release-string.patch;patch=1 \
            file://pxa-serial-hack.patch;patch=1 \
            ${RPSRC}/pxa-linking-bug.patch;patch=1 \