merge of '4688c77d9f496fd36f6b1845f37bc3c42af85968'

     and 'dd83c0ba4e83a6207462418b614431ce061d9481'

3 files changed, 14 insertions, 17 deletions

diff --git a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
index 7eadfc61fe..0310746dfe 100644
--- a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
+++ b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
@@ -1,7 +1,6 @@
-Index: linux-2.6.23/drivers/leds/Kconfig
-===================================================================
+diff -urN linux-2.6.23.orig/drivers/leds/Kconfig linux-2.6.23/drivers/leds/Kconfig
 --- linux-2.6.23.orig/drivers/leds/Kconfig	2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6.23/drivers/leds/Kconfig	2007-11-28 23:16:05.000000000 +0100
++++ linux-2.6.23/drivers/leds/Kconfig	2007-11-29 09:02:42.000000000 +0100
 @@ -101,6 +101,12 @@
  	  outputs. To be useful the particular board must have LEDs
  	  and they must be connected to the GPIO lines.
@@ -15,10 +14,9 @@ Index: linux-2.6.23/drivers/leds/Kconfig
  comment "LED Triggers"
  
  config LEDS_TRIGGERS
-Index: linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c	2007-11-29 00:45:42.000000000 +0100
+diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c
+--- linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c	2007-11-29 09:02:42.000000000 +0100
 @@ -0,0 +1,128 @@
 +/*
 + * drivers/leds/leds-mpc8313e-rdb.c
@@ -147,16 +145,15 @@ Index: linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c
 +
 +MODULE_AUTHOR("Leon Woestenberg <leon@sidebranch.com>");
 +MODULE_DESCRIPTION("MPC8313E-RDB LED driver");
-+
-Index: linux-2.6.23/drivers/leds/Makefile
-===================================================================
---- linux-2.6.23.orig/drivers/leds/Makefile	2007-11-28 23:17:29.000000000 +0100
-+++ linux-2.6.23/drivers/leds/Makefile	2007-11-28 23:35:32.000000000 +0100
++MODULE_LICENSE("GPL");
+diff -urN linux-2.6.23.orig/drivers/leds/Makefile linux-2.6.23/drivers/leds/Makefile
+--- linux-2.6.23.orig/drivers/leds/Makefile	2007-10-09 22:31:38.000000000 +0200
++++ linux-2.6.23/drivers/leds/Makefile	2007-11-29 09:03:09.000000000 +0100
 @@ -17,6 +17,7 @@
  obj-$(CONFIG_LEDS_H1940)		+= leds-h1940.o
  obj-$(CONFIG_LEDS_COBALT)		+= leds-cobalt.o
  obj-$(CONFIG_LEDS_GPIO)			+= leds-gpio.o
 +obj-$(CONFIG_LEDS_MPC8313E_RDB)		+= leds-mpc8313e-rdb.o
-  
+ 
  # LED Triggers
-  obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o
+ obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o
diff --git a/packages/linux/linux-openmoko/defconfig-2.6.22.5 b/packages/linux/linux-openmoko/defconfig-2.6.22.5
index 62a61935f6..e9e40fed38 100644
--- a/packages/linux/linux-openmoko/defconfig-2.6.22.5
+++ b/packages/linux/linux-openmoko/defconfig-2.6.22.5
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.22.5
-# Wed Nov 21 11:45:19 2007
+# Tue Nov 27 09:09:32 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -705,7 +705,7 @@ CONFIG_MTD_NAND_S3C2410=y
 CONFIG_MTD_NAND_S3C2410_BBT=y
 # CONFIG_MTD_NAND_S3C2410_DEBUG is not set
 CONFIG_MTD_NAND_S3C2410_HWECC=y
-CONFIG_MTD_NAND_S3C2410_CLKSTOP=y
+# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb
index 1af9ed58a7..c623504c73 100644
--- a/packages/linux/linux-openmoko_2.6.22.5.bb
+++ b/packages/linux/linux-openmoko_2.6.22.5.bb
@@ -9,7 +9,7 @@ KERNEL_RELEASE = "2.6.22.5"
 #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}-moko11+svnr${SRCREV}"
 
 PV = "${KERNEL_RELEASE}-moko11+svnr${SRCREV}"
-PR = "r9"
+PR = "r10"
 
 KERNEL_IMAGETYPE = "uImage"
 UBOOT_ENTRYPOINT = "30008000"