linux-rp-2.6.23+2.6.24-rc8: Update defconfigs, remove merged zylonite patch

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3558 311d38ba-8fff-0310-9ca6-ca027cbcb966

14 files changed, 3198 insertions, 8646 deletions

diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/arm_pxa_20070923.patch b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/arm_pxa_20070923.patch
deleted file mode 100644
index ad4ce996d..000000000
--- a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/arm_pxa_20070923.patch
+++ /dev/null
@@ -1,5877 +0,0 @@
-# Base git commit: da8f153e51290e7438ba7da66234a864e5d3e1c1
-#	(Revert "x86_64: Quicklist support for x86_64")
-#
-# Author:    eric miao (Wed Sep 12 03:13:17 BST 2007)
-# Committer: Russell King (Sun Sep 23 14:18:19 BST 2007)
-#   
-#   [ARM] pxa: PXA3xx base support
-#   
-#   Signed-off-by: eric miao
-#   Signed-off-by: Russell King
-#
-# arch/arm/Kconfig                         |    6 
-# arch/arm/boot/compressed/head-xscale.S   |    4 
-# arch/arm/mach-pxa/Kconfig                |   30 +
-# arch/arm/mach-pxa/Makefile               |    9 
-# arch/arm/mach-pxa/clock.c                |   79 ++--
-# arch/arm/mach-pxa/clock.h                |   43 ++
-# arch/arm/mach-pxa/devices.h              |    3 
-# arch/arm/mach-pxa/generic.c              |  146 ++++---
-# arch/arm/mach-pxa/generic.h              |   26 +
-# arch/arm/mach-pxa/irq.c                  |   80 ----
-# arch/arm/mach-pxa/mfp.c                  |  235 ++++++++++++
-# arch/arm/mach-pxa/pxa25x.c               |   90 ++++
-# arch/arm/mach-pxa/pxa27x.c               |  127 ++++++
-# arch/arm/mach-pxa/pxa300.c               |   93 +++++
-# arch/arm/mach-pxa/pxa320.c               |   88 ++++
-# arch/arm/mach-pxa/pxa3xx.c               |  216 +++++++++++
-# arch/arm/mach-pxa/time.c                 |   53 ++
-# arch/arm/mach-pxa/zylonite.c             |  184 +++++++++
-# arch/arm/mach-pxa/zylonite_pxa300.c      |  188 ++++++++++
-# arch/arm/mach-pxa/zylonite_pxa320.c      |  173 +++++++++
-# arch/arm/mm/Kconfig                      |    4 
-# drivers/i2c/busses/i2c-pxa.c             |   45 +-
-# drivers/input/keyboard/pxa27x_keyboard.c |   25 +
-# drivers/mmc/host/pxamci.c                |   43 +-
-# drivers/mmc/host/pxamci.h                |   14 
-# drivers/mtd/maps/lubbock-flash.c         |    9 
-# drivers/mtd/maps/mainstone-flash.c       |    5 
-# drivers/net/irda/pxaficp_ir.c            |   51 ++
-# drivers/net/smc91x.c                     |   62 ---
-# drivers/net/smc91x.h                     |   71 +++
-# drivers/serial/pxa.c                     |  163 ++++----
-# drivers/serial/serial_core.c             |   18 
-# drivers/usb/gadget/pxa2xx_udc.c          |   68 ++-
-# drivers/usb/gadget/pxa2xx_udc.h          |    1 
-# drivers/video/pxafb.c                    |   36 +
-# drivers/video/pxafb.h                    |    1 
-# include/asm-arm/arch-pxa/hardware.h      |   72 +++
-# include/asm-arm/arch-pxa/irqs.h          |    6 
-# include/asm-arm/arch-pxa/mfp-pxa300.h    |  574 ++++++++++++++++++++++++++++++
-# include/asm-arm/arch-pxa/mfp-pxa320.h    |  446 ++++++++++++++++++++++++
-# include/asm-arm/arch-pxa/mfp.h           |  576 +++++++++++++++++++++++++++++++
-# include/asm-arm/arch-pxa/pxa-regs.h      |    2 
-# include/asm-arm/arch-pxa/pxa3xx-regs.h   |   75 ++++
-# include/asm-arm/arch-pxa/timex.h         |    2 
-# include/asm-arm/arch-pxa/zylonite.h      |   35 +
-# 45 files changed, 3825 insertions(+), 452 deletions(-)
-#    create mode 100644 arch/arm/mach-pxa/mfp.c
-#    create mode 100644 arch/arm/mach-pxa/pxa300.c
-#    create mode 100644 arch/arm/mach-pxa/pxa320.c
-#    create mode 100644 arch/arm/mach-pxa/pxa3xx.c
-#    create mode 100644 arch/arm/mach-pxa/zylonite.c
-#    create mode 100644 arch/arm/mach-pxa/zylonite_pxa300.c
-#    create mode 100644 arch/arm/mach-pxa/zylonite_pxa320.c
-#    create mode 100644 include/asm-arm/arch-pxa/mfp-pxa300.h
-#    create mode 100644 include/asm-arm/arch-pxa/mfp-pxa320.h
-#    create mode 100644 include/asm-arm/arch-pxa/mfp.h
-#    create mode 100644 include/asm-arm/arch-pxa/pxa3xx-regs.h
-#    create mode 100644 include/asm-arm/arch-pxa/zylonite.h
-#
-# Author:    Russell King (Sat Sep  1 21:27:18 BST 2007)
-# Committer: Russell King (Sun Sep 23 14:18:17 BST 2007)
-#   
-#   [NET] smc91x: fix PXA DMA support code
-#   
-#   The PXA DMA support code for smc91x doesn't pass a struct device to
-#   the dma_*map_single() functions, which leads to an oops in the dma
-#   bounce code.  We have a struct device which was used to probe the
-#   SMC chip.  Use it.
-#   
-#   (This patch is slightly larger because it requires struct smc_local
-#   to move into the header file.)
-#   
-#   Signed-off-by: Russell King
-#
-#
-# Author:    Russell King (Sat Sep  1 21:25:09 BST 2007)
-# Committer: Russell King (Sun Sep 23 14:18:12 BST 2007)
-#   
-#   [SERIAL] Fix console initialisation ordering
-#   
-#   Ensure pm callback is called upon initialisation to place port in
-#   correct power saving state.  Ensure console is initialised prior
-#   to deciding whether to power down the port.
-#   
-#   Signed-off-by: Russell King
-#
-#
-# Author:    Russell King (Wed Sep 19 09:21:51 BST 2007)
-# Committer: Russell King (Sun Sep 23 14:18:07 BST 2007)
-#   
-#   [ARM] pxa: tidy up arch/arm/mach-pxa/Makefile
-#   
-#   Signed-off-by: Russell King
-#
-#
-# Author:    Russell King (Sat Sep  1 21:28:55 BST 2007)
-# Committer: Russell King (Sun Sep 23 14:18:03 BST 2007)
-#   
-#   [ARM] lubbock, mainstone: only initialise if running on that platform
-#   
-#   Signed-off-by: Russell King
-#
-#
-# Author:    eric miao (Wed Aug 29 10:22:17 BST 2007)
-# Committer: Russell King (Sun Sep 23 14:18:01 BST 2007)
-#   
-#   [ARM] 4560/1: pxa: move processor specific set_wake logic out of irq.c
-#   
-#   a function pxa_init_irq_set_wake() was introduced, so that
-#   processor specific code could install their own version
-#   
-#   code setting PFER and PRER registers within pxa_gpio_irq_type
-#   are removed, and the edge configuration is postponed to the
-#   (*set_wake) and copies the GRER and GFER register, which will
-#   always be set up correctly by pxa_gpio_irq_type()
-#   
-#   Signed-off-by: eric miao
-#   Signed-off-by: Russell King
-#
-#
-# Author:    eric miao (Wed Aug 29 10:18:47 BST 2007)
-# Committer: Russell King (Sun Sep 23 14:17:59 BST 2007)
-#   
-#   [ARM] 4559/1: pxa: make PXA_LAST_GPIO a run-time variable
-#   
-#   This definition produces processor specific code in generic function
-#   pxa_gpio_mode(), thus creating inconsistencies for support of pxa25x
-#   and pxa27x in a single zImage.
-#   
-#   As David Brownell suggests, make it a run-time variable and initialize
-#   at run-time according to the number of GPIOs on the processor. For now
-#   the initialization happens in pxa_init_irq_gpio(),  since there is
-#   already a parameter for that, besides, this is and MUST be earlier
-#   than any subsequent calls to pxa_gpio_mode().
-#   
-#   Signed-off-by: eric miao
-#   Signed-off-by: Russell King
-#
-#
-# Author:    eric miao (Wed Aug 29 10:15:41 BST 2007)
-# Committer: Russell King (Sun Sep 23 14:17:57 BST 2007)
-#   
-#   [ARM] 4558/1: pxa: remove MACH_TYPE_LUBBOCK assignment and leave it to boot loader
-#   
-#   since both u-boot and blob support passing MACH_TYPE_LUBBOCK to the
-#   kernel, it should be quite safe to remove this
-#   
-#   Signed-off-by: eric miao
-#   Acked-by: Nicolas Pitre
-#   Signed-off-by: Russell King
-#
-#
-# Author:    eric miao (Wed Sep 12 03:13:17 BST 2007)
-# Committer: Russell King (Sun Sep 23 14:17:55 BST 2007)
-#   
-#   [ARM] pxa: add PXA3 cpu_is_xxx() macros
-#   
-#   Extracted from patch by Eric Miao, this adds the cpu_is_xxx() macros
-#   for identifying PXA3 SoCs.
-#   
-#   Signed-off-by: eric miao
-#   Signed-off-by: Russell King
-#
-#
-# Author:    Russell King (Wed Sep 19 09:38:32 BST 2007)
-# Committer: Russell King (Sun Sep 23 14:17:51 BST 2007)
-#   
-#   [ARM] pxa: Make CPU_XSCALE depend on PXA25x or PXA27x
-#   
-#   PXA3 SoCs are supported by the Xscale3 CPU code rather than the
-#   Xscale CPU code.
-#   
-#   Signed-off-by: Russell King
-#
-#
-# Author:    Russell King (Wed Sep 19 09:33:55 BST 2007)
-# Committer: Russell King (Sun Sep 23 14:17:48 BST 2007)
-#   
-#   [ARM] pxa: mark pxa_set_cken deprecated
-#   
-#   Allow the generic clock support code to fiddle with the CKEN register
-#   and mark pxa_set_cken() deprecated.
-#   
-#   Signed-off-by: Russell King
-#
-#
-# Author:    Russell King (Mon Aug 20 10:34:37 BST 2007)
-# Committer: Russell King (Sun Sep 23 14:17:43 BST 2007)
-#   
-#   [ARM] pxa: remove get_lcdclk_frequency_10khz()
-#   
-#   get_lcdclk_frequency_10khz() is now redundant, remove it.  Hide
-#   pxa27x_get_lcdclk_frequency_10khz() from public view.
-#   
-#   Signed-off-by: Russell King
-#
-#
-# Author:    Russell King (Sun Sep  2 17:09:23 BST 2007)
-# Committer: Russell King (Sun Sep 23 14:17:39 BST 2007)
-#   
-#   [ARM] pxa: update pxa irda driver to use clk support
-#   
-#   Signed-off-by: Russell King
-#
-#
-# Author:    Russell King (Sun Sep  2 17:08:42 BST 2007)
-# Committer: Russell King (Sun Sep 23 14:17:36 BST 2007)
-#   
-#   [ARM] pxa: Make STUART and FICP clocks available
-#   
-#   Signed-off-by: Russell King
-#
-#
-# Author:    Russell King (Mon Aug 20 10:33:35 BST 2007)
-# Committer: Russell King (Sun Sep 23 14:17:34 BST 2007)
-#   
-#   [ARM] pxa: update PXA UDC driver to use clk support
-#   
-#   Note: this produces a WARN() dump.
-#   
-#   Signed-off-by: Russell King
-#
-#
-# Author:    Russell King (Mon Aug 20 10:28:15 BST 2007)
-# Committer: Russell King (Sun Sep 23 14:17:31 BST 2007)
-#   
-#   [ARM] pxa: update pxa serial driver to use clk support
-#   
-#   Signed-off-by: Russell King
-#
-#
-# Author:    Russell King (Mon Aug 20 10:20:03 BST 2007)
-# Committer: Russell King (Sun Sep 23 14:17:27 BST 2007)
-#   
-#   [ARM] pxa: update PXA MMC interface driver to use clk support
-#   
-#   Signed-off-by: Russell King
-#
-#
-# Author:    Russell King (Mon Aug 20 10:19:39 BST 2007)
-# Committer: Russell King (Sun Sep 23 14:17:23 BST 2007)
-#   
-#   [ARM] pxa: update pxa27x keypad driver to use clk support
-#   
-#   Signed-off-by: Russell King
-#
-#
-# Author:    Russell King (Mon Aug 20 10:19:10 BST 2007)
-# Committer: Russell King (Sun Sep 23 14:17:19 BST 2007)
-#   
-#   [ARM] pxa: update pxa i2c driver to use clk support
-#   
-#   Signed-off-by: Russell King
-#
-#
-# Author:    Russell King (Mon Aug 20 10:18:42 BST 2007)
-# Committer: Russell King (Sun Sep 23 14:16:50 BST 2007)
-#   
-#   [ARM] pxa: update pxafb to use clk support
-#   
-#   Signed-off-by: Russell King
-#
-#
-# Author:    Russell King (Mon Aug 20 10:18:02 BST 2007)
-# Committer: Russell King (Sat Sep 22 20:48:09 BST 2007)
-#   
-#   [ARM] pxa: introduce clk support for PXA SoC clocks
-#   
-#   Signed-off-by: Russell King
-#
-#    create mode 100644 arch/arm/mach-pxa/clock.h
-#
-# Author:    Russell King (Mon Aug 20 10:09:18 BST 2007)
-# Committer: Russell King (Sat Sep 22 20:48:09 BST 2007)
-#   
-#   [ARM] pxa: make pxa27x devices globally visible
-#   
-#   Signed-off-by: Russell King
-#
-#
-# Author:    Russell King (Mon Aug 20 10:07:44 BST 2007)
-# Committer: Russell King (Sat Sep 22 20:48:08 BST 2007)
-#   
-#   [ARM] pxa: fix naming of memory/lcd/core clock functions
-#   
-#   Rename pxa25x and pxa27x memory/lcd/core clock functions, and
-#   select the correct version at run time.
-#   
-#   Signed-off-by: Russell King
-#
-#
-# Author:    Russell King (Mon Aug 20 09:47:41 BST 2007)
-# Committer: Russell King (Sat Sep 22 20:48:08 BST 2007)
-#   
-#   [ARM] pxa: convert PXA serial drivers to use platform resources
-#   
-#   Signed-off-by: Russell King
-#
-#
-# Author:    Russell King (Sat Sep  1 21:12:50 BST 2007)
-# Committer: Russell King (Sat Sep 22 20:48:07 BST 2007)
-#   
-#   [ARM] pxa: make pxa timer initialisation select clock rate at runtime
-#   
-#   Rather than using the compile-time constant CLOCK_TICK_RATE, select
-#   the clock tick rate at run time.  We organise the selection so that
-#   PXA3 automatically falls out with the right tick rate.
-#   
-#   Signed-off-by: Russell King
-#
-#
-# Author:    Nicolas Pitre (Fri Aug 17 16:55:22 BST 2007)
-# Committer: Russell King (Sat Sep 22 20:48:05 BST 2007)
-#   
-#   [ARM] 4550/1: sched_clock on PXA should cope with run time clock rate selection
-#   
-#   The previous implementation was relying on compile time optimizations
-#   based on a constant clock rate.  However, support for different PXA
-#   flavors in the same kernel binary requires that the clock be selected at
-#   run time, so here it is.
-#   
-#   Let's move this code to a more appropriate location while at it.
-#   
-#   Signed-off-by: Nicolas Pitre
-#   Signed-off-by: Russell King
-#
-#
---- linux-2.6.23.orig/arch/arm/Kconfig
-+++ linux-2.6.23/arch/arm/Kconfig
-@@ -336,14 +336,14 @@
- 	  This enables support for Philips PNX4008 mobile platform.
- 
- config ARCH_PXA
--	bool "PXA2xx-based"
-+	bool "PXA2xx/PXA3xx-based"
- 	depends on MMU
- 	select ARCH_MTD_XIP
- 	select GENERIC_GPIO
- 	select GENERIC_TIME
- 	select GENERIC_CLOCKEVENTS
- 	help
--	  Support for Intel's PXA2XX processor line.
-+	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.
- 
- config ARCH_RPC
- 	bool "RiscPC"
-@@ -486,7 +486,7 @@
- config IWMMXT
- 	bool "Enable iWMMXt support"
- 	depends on CPU_XSCALE || CPU_XSC3
--	default y if PXA27x
-+	default y if PXA27x || PXA3xx
- 	help
- 	  Enable support for iWMMXt context switching at run time if
- 	  running on a CPU that supports it.
---- linux-2.6.23.orig/arch/arm/boot/compressed/head-xscale.S
-+++ linux-2.6.23/arch/arm/boot/compressed/head-xscale.S
-@@ -33,10 +33,6 @@
- 		bic	r0, r0, #0x1000		@ clear Icache
- 		mcr	p15, 0, r0, c1, c0, 0
- 
--#ifdef CONFIG_ARCH_LUBBOCK
--		mov	r7, #MACH_TYPE_LUBBOCK
--#endif
--
- #ifdef CONFIG_ARCH_COTULLA_IDP
- 		mov	r7, #MACH_TYPE_COTULLA_IDP
- #endif
---- linux-2.6.23.orig/arch/arm/mach-pxa/Kconfig
-+++ linux-2.6.23/arch/arm/mach-pxa/Kconfig
-@@ -1,6 +1,24 @@
- if ARCH_PXA
- 
--menu "Intel PXA2xx Implementations"
-+menu "Intel PXA2xx/PXA3xx Implementations"
-+
-+if PXA3xx
-+
-+menu "Supported PXA3xx Processor Variants"
-+
-+config CPU_PXA300
-+	bool "PXA300 (codename Monahans-L)"
-+
-+config CPU_PXA310
-+	bool "PXA310 (codename Monahans-LV)"
-+	select CPU_PXA300
-+
-+config CPU_PXA320
-+	bool "PXA320 (codename Monahans-P)"
-+
-+endmenu
-+
-+endif
- 
- choice
- 	prompt "Select target board"
-@@ -41,6 +59,11 @@
- 	bool "CompuLab EM-x270 platform"
- 	select PXA27x
- 
-+
-+config MACH_ZYLONITE
-+	bool "PXA3xx Development Platform"
-+	select PXA3xx
-+
- config MACH_HX2750
- 	bool "HP iPAQ hx2750"
- 	select PXA27x
-@@ -228,6 +251,11 @@
- 	help
- 	  Select code specific to PXA27x variants
- 
-+config PXA3xx
-+	bool
-+	help
-+	  Select code specific to PXA3xx variants
-+
- config PXA_SHARP_C7xx
- 	bool
- 	select PXA_SSP
---- linux-2.6.23.orig/arch/arm/mach-pxa/Makefile
-+++ linux-2.6.23/arch/arm/mach-pxa/Makefile
-@@ -6,6 +6,9 @@
- obj-y += clock.o generic.o irq.o dma.o time.o
- obj-$(CONFIG_PXA25x) += pxa25x.o
- obj-$(CONFIG_PXA27x) += pxa27x.o
-+obj-$(CONFIG_PXA3xx) += pxa3xx.o mfp.o
-+obj-$(CONFIG_CPU_PXA300)       += pxa300.o
-+obj-$(CONFIG_CPU_PXA320)       += pxa320.o
- 
- # Specific board support
- obj-$(CONFIG_ARCH_LUBBOCK) += lubbock.o
-@@ -19,6 +22,12 @@
- obj-$(CONFIG_MACH_POODLE)	+= poodle.o corgi_ssp.o sharpsl_pm.o poodle_pm.o
- obj-$(CONFIG_MACH_TOSA)         += tosa.o
- obj-$(CONFIG_MACH_EM_X270) += em-x270.o
-+ifeq ($(CONFIG_MACH_ZYLONITE),y)
-+   obj-y			+= zylonite.o
-+   obj-$(CONFIG_CPU_PXA300)	+= zylonite_pxa300.o
-+   obj-$(CONFIG_CPU_PXA320)	+= zylonite_pxa320.o
-+endif
-+
- obj-$(CONFIG_MACH_HX2750)	+= hx2750.o hx2750_test.o
- obj-$(CONFIG_MACH_HTCUNIVERSAL) += htcuniversal/
- 
---- linux-2.6.23.orig/arch/arm/mach-pxa/clock.c
-+++ linux-2.6.23/arch/arm/mach-pxa/clock.c
-@@ -9,19 +9,15 @@
- #include <linux/string.h>
- #include <linux/clk.h>
- #include <linux/spinlock.h>
-+#include <linux/platform_device.h>
-+#include <linux/delay.h>
- 
- #include <asm/arch/pxa-regs.h>
- #include <asm/hardware.h>
- 
--struct clk {
--	struct list_head	node;
--	unsigned long		rate;
--	struct module		*owner;
--	const char		*name;
--	unsigned int		enabled;
--	void			(*enable)(void);
--	void			(*disable)(void);
--};
-+#include "devices.h"
-+#include "generic.h"
-+#include "clock.h"
- 
- static LIST_HEAD(clocks);
- static DEFINE_MUTEX(clocks_mutex);
-@@ -33,7 +29,8 @@
- 
- 	mutex_lock(&clocks_mutex);
- 	list_for_each_entry(p, &clocks, node) {
--		if (strcmp(id, p->name) == 0 && try_module_get(p->owner)) {
-+		if (strcmp(id, p->name) == 0 &&
-+		    (p->dev == NULL || p->dev == dev)) {
- 			clk = p;
- 			break;
- 		}
-@@ -46,7 +43,6 @@
- 
- void clk_put(struct clk *clk)
- {
--	module_put(clk->owner);
- }
- EXPORT_SYMBOL(clk_put);
- 
-@@ -56,8 +52,12 @@
- 
- 	spin_lock_irqsave(&clocks_lock, flags);
- 	if (clk->enabled++ == 0)
--		clk->enable();
-+		clk->ops->enable(clk);
- 	spin_unlock_irqrestore(&clocks_lock, flags);
-+
-+	if (clk->delay)
-+		udelay(clk->delay);
-+
- 	return 0;
- }
- EXPORT_SYMBOL(clk_enable);
-@@ -70,54 +70,75 @@
- 
- 	spin_lock_irqsave(&clocks_lock, flags);
- 	if (--clk->enabled == 0)
--		clk->disable();
-+		clk->ops->disable(clk);
- 	spin_unlock_irqrestore(&clocks_lock, flags);
- }
- EXPORT_SYMBOL(clk_disable);
- 
- unsigned long clk_get_rate(struct clk *clk)
- {
--	return clk->rate;
-+	unsigned long rate;
-+
-+	rate = clk->rate;
-+	if (clk->ops->getrate)
-+		rate = clk->ops->getrate(clk);
-+
-+	return rate;
- }
- EXPORT_SYMBOL(clk_get_rate);
- 
- 
--static void clk_gpio27_enable(void)
-+static void clk_gpio27_enable(struct clk *clk)
- {
- 	pxa_gpio_mode(GPIO11_3_6MHz_MD);
- }
- 
--static void clk_gpio27_disable(void)
-+static void clk_gpio27_disable(struct clk *clk)
- {
- }
- 
--static struct clk clk_gpio27 = {
--	.name		= "GPIO27_CLK",
--	.rate		= 3686400,
-+static const struct clkops clk_gpio27_ops = {
- 	.enable		= clk_gpio27_enable,
- 	.disable	= clk_gpio27_disable,
- };
- 
--int clk_register(struct clk *clk)
-+
-+void clk_cken_enable(struct clk *clk)
- {
--	mutex_lock(&clocks_mutex);
--	list_add(&clk->node, &clocks);
--	mutex_unlock(&clocks_mutex);
--	return 0;
-+	CKEN |= 1 << clk->cken;
- }
--EXPORT_SYMBOL(clk_register);
- 
--void clk_unregister(struct clk *clk)
-+void clk_cken_disable(struct clk *clk)
- {
-+	CKEN &= ~(1 << clk->cken);
-+}
-+
-+const struct clkops clk_cken_ops = {
-+	.enable		= clk_cken_enable,
-+	.disable	= clk_cken_disable,
-+};
-+
-+static struct clk common_clks[] = {
-+	{
-+		.name		= "GPIO27_CLK",
-+		.ops		= &clk_gpio27_ops,
-+		.rate		= 3686400,
-+	},
-+};
-+
-+void clks_register(struct clk *clks, size_t num)
-+{
-+	int i;
-+
- 	mutex_lock(&clocks_mutex);
--	list_del(&clk->node);
-+	for (i = 0; i < num; i++)
-+		list_add(&clks[i].node, &clocks);
- 	mutex_unlock(&clocks_mutex);
- }
--EXPORT_SYMBOL(clk_unregister);
- 
- static int __init clk_init(void)
- {
--	clk_register(&clk_gpio27);
-+	clks_register(common_clks, ARRAY_SIZE(common_clks));
- 	return 0;
- }
- arch_initcall(clk_init);
---- /dev/null
-+++ linux-2.6.23/arch/arm/mach-pxa/clock.h
-@@ -0,0 +1,43 @@
-+struct clk;
-+
-+struct clkops {
-+	void			(*enable)(struct clk *);
-+	void			(*disable)(struct clk *);
-+	unsigned long		(*getrate)(struct clk *);
-+};
-+
-+struct clk {
-+	struct list_head	node;
-+	const char		*name;
-+	struct device		*dev;
-+	const struct clkops	*ops;
-+	unsigned long		rate;
-+	unsigned int		cken;
-+	unsigned int		delay;
-+	unsigned int		enabled;
-+};
-+
-+#define INIT_CKEN(_name, _cken, _rate, _delay, _dev)	\
-+	{						\
-+		.name	= _name,			\
-+		.dev	= _dev,				\
-+		.ops	= &clk_cken_ops,		\
-+		.rate	= _rate,			\
-+		.cken	= CKEN_##_cken,			\
-+		.delay	= _delay,			\
-+	}
-+
-+#define INIT_CK(_name, _cken, _ops, _dev)		\
-+	{						\
-+		.name	= _name,			\
-+		.dev	= _dev,				\
-+		.ops	= _ops,				\
-+		.cken	= CKEN_##_cken,			\
-+	}
-+
-+extern const struct clkops clk_cken_ops;
-+
-+void clk_cken_enable(struct clk *clk);
-+void clk_cken_disable(struct clk *clk);
-+
-+void clks_register(struct clk *clks, size_t num);
---- linux-2.6.23.orig/arch/arm/mach-pxa/devices.h
-+++ linux-2.6.23/arch/arm/mach-pxa/devices.h
-@@ -9,3 +9,6 @@
- extern struct platform_device pxa_device_i2s;
- extern struct platform_device pxa_device_ficp;
- extern struct platform_device pxa_device_rtc;
-+
-+extern struct platform_device pxa27x_device_i2c_power;
-+extern struct platform_device pxa27x_device_ohci;
---- linux-2.6.23.orig/arch/arm/mach-pxa/generic.c
-+++ linux-2.6.23/arch/arm/mach-pxa/generic.c
-@@ -25,10 +25,6 @@
- #include <linux/pm.h>
- #include <linux/string.h>
- 
--#include <linux/sched.h>
--#include <asm/cnt32_to_63.h>
--#include <asm/div64.h>
--
- #include <asm/hardware.h>
- #include <asm/irq.h>
- #include <asm/system.h>
-@@ -48,66 +44,39 @@
- #include "generic.h"
- 
- /*
-- * This is the PXA2xx sched_clock implementation. This has a resolution
-- * of at least 308ns and a maximum value that depends on the value of
-- * CLOCK_TICK_RATE.
-- *
-- * The return value is guaranteed to be monotonic in that range as
-- * long as there is always less than 582 seconds between successive
-- * calls to this function.
-+ * Get the clock frequency as reflected by CCCR and the turbo flag.
-+ * We assume these values have been applied via a fcs.
-+ * If info is not 0 we also display the current settings.
-  */
--unsigned long long sched_clock(void)
-+unsigned int get_clk_frequency_khz(int info)
- {
--	unsigned long long v = cnt32_to_63(OSCR);
--	/* Note: top bit ov v needs cleared unless multiplier is even. */
--
--#if	CLOCK_TICK_RATE == 3686400
--	/* 1E9 / 3686400 => 78125 / 288, max value = 32025597s (370 days). */
--	/* The <<1 is used to get rid of tick.hi top bit */
--	v *= 78125<<1;
--	do_div(v, 288<<1);
--#elif	CLOCK_TICK_RATE == 3250000
--	/* 1E9 / 3250000 => 4000 / 13, max value = 709490156s (8211 days) */
--	v *= 4000;
--	do_div(v, 13);
--#elif	CLOCK_TICK_RATE == 3249600
--	/* 1E9 / 3249600 => 625000 / 2031, max value = 4541295s (52 days) */
--	v *= 625000;
--	do_div(v, 2031);
--#else
--#warning "consider fixing sched_clock for your value of CLOCK_TICK_RATE"
--	/*
--	 * 96-bit math to perform tick * NSEC_PER_SEC / CLOCK_TICK_RATE for
--	 * any value of CLOCK_TICK_RATE. Max value is in the 80 thousand
--	 * years range and truncation to unsigned long long limits it to
--	 * sched_clock's max range of ~584 years.  This is nice but with
--	 * higher computation cost.
--	 */
--	{
--		union {
--			unsigned long long val;
--			struct { unsigned long lo, hi; };
--		} x;
--		unsigned long long y;
--
--		x.val = v;
--		x.hi &= 0x7fffffff;
--		y = (unsigned long long)x.lo * NSEC_PER_SEC;
--		x.lo = y;
--		y = (y >> 32) + (unsigned long long)x.hi * NSEC_PER_SEC;
--		x.hi = do_div(y, CLOCK_TICK_RATE);
--		do_div(x.val, CLOCK_TICK_RATE);
--		x.hi += y;
--		v = x.val;
--	}
--#endif
-+	if (cpu_is_pxa21x() || cpu_is_pxa25x())
-+		return pxa25x_get_clk_frequency_khz(info);
-+	else if (cpu_is_pxa27x())
-+		return pxa27x_get_clk_frequency_khz(info);
-+	else
-+		return pxa3xx_get_clk_frequency_khz(info);
-+}
-+EXPORT_SYMBOL(get_clk_frequency_khz);
- 
--	return v;
-+/*
-+ * Return the current memory clock frequency in units of 10kHz
-+ */
-+unsigned int get_memclk_frequency_10khz(void)
-+{
-+	if (cpu_is_pxa21x() || cpu_is_pxa25x())
-+		return pxa25x_get_memclk_frequency_10khz();
-+	else if (cpu_is_pxa27x())
-+		return pxa27x_get_memclk_frequency_10khz();
-+	else
-+		return pxa3xx_get_memclk_frequency_10khz();
- }
-+EXPORT_SYMBOL(get_memclk_frequency_10khz);
- 
- /*
-  * Handy function to set GPIO alternate functions
-  */
-+int pxa_last_gpio;
- 
- int pxa_gpio_mode(int gpio_mode)
- {
-@@ -116,7 +85,7 @@
- 	int fn = (gpio_mode & GPIO_MD_MASK_FN) >> 8;
- 	int gafr;
- 
--	if (gpio > PXA_LAST_GPIO)
-+	if (gpio > pxa_last_gpio)
- 		return -EINVAL;
- 
- 	local_irq_save(flags);
-@@ -160,7 +129,7 @@
- /*
-  * Routine to safely enable or disable a clock in the CKEN
-  */
--void pxa_set_cken(int clock, int enable)
-+void __pxa_set_cken(int clock, int enable)
- {
- 	unsigned long flags;
- 	local_irq_save(flags);
-@@ -173,7 +142,7 @@
- 	local_irq_restore(flags);
- }
- 
--EXPORT_SYMBOL(pxa_set_cken);
-+EXPORT_SYMBOL(__pxa_set_cken);
- 
- /*
-  * Intel PXA2xx internal register mapping.
-@@ -330,21 +299,80 @@
- 	pxa_device_fb.dev.parent = parent_dev;
- }
- 
-+static struct resource pxa_resource_ffuart[] = {
-+	{
-+		.start	= __PREG(FFUART),
-+		.end	= __PREG(FFUART) + 35,
-+		.flags	= IORESOURCE_MEM,
-+	}, {
-+		.start	= IRQ_FFUART,
-+		.end	= IRQ_FFUART,
-+		.flags	= IORESOURCE_IRQ,
-+	}
-+};
-+
- struct platform_device pxa_device_ffuart= {
- 	.name		= "pxa2xx-uart",
- 	.id		= 0,
-+	.resource	= pxa_resource_ffuart,
-+	.num_resources	= ARRAY_SIZE(pxa_resource_ffuart),
-+};
-+
-+static struct resource pxa_resource_btuart[] = {
-+	{
-+		.start	= __PREG(BTUART),
-+		.end	= __PREG(BTUART) + 35,
-+		.flags	= IORESOURCE_MEM,
-+	}, {
-+		.start	= IRQ_BTUART,
-+		.end	= IRQ_BTUART,
-+		.flags	= IORESOURCE_IRQ,
-+	}
- };
-+
- struct platform_device pxa_device_btuart = {
- 	.name		= "pxa2xx-uart",
- 	.id		= 1,
-+	.resource	= pxa_resource_btuart,
-+	.num_resources	= ARRAY_SIZE(pxa_resource_btuart),
- };
-+
-+static struct resource pxa_resource_stuart[] = {
-+	{
-+		.start	= __PREG(STUART),
-+		.end	= __PREG(STUART) + 35,
-+		.flags	= IORESOURCE_MEM,
-+	}, {
-+		.start	= IRQ_STUART,
-+		.end	= IRQ_STUART,
-+		.flags	= IORESOURCE_IRQ,
-+	}
-+};
-+
- struct platform_device pxa_device_stuart = {
- 	.name		= "pxa2xx-uart",
- 	.id		= 2,
-+	.resource	= pxa_resource_stuart,
-+	.num_resources	= ARRAY_SIZE(pxa_resource_stuart),
-+};
-+
-+static struct resource pxa_resource_hwuart[] = {
-+	{
-+		.start	= __PREG(HWUART),
-+		.end	= __PREG(HWUART) + 47,
-+		.flags	= IORESOURCE_MEM,
-+	}, {
-+		.start	= IRQ_HWUART,
-+		.end	= IRQ_HWUART,
-+		.flags	= IORESOURCE_IRQ,
-+	}
- };
-+
- struct platform_device pxa_device_hwuart = {
- 	.name		= "pxa2xx-uart",
- 	.id		= 3,
-+	.resource	= pxa_resource_hwuart,
-+	.num_resources	= ARRAY_SIZE(pxa_resource_hwuart),
- };
- 
- void __init pxa_set_ffuart_info(struct platform_pxa_serial_funcs *info)
---- linux-2.6.23.orig/arch/arm/mach-pxa/generic.h
-+++ linux-2.6.23/arch/arm/mach-pxa/generic.h
-@@ -15,14 +15,40 @@
- extern void __init pxa_init_irq_low(void);
- extern void __init pxa_init_irq_high(void);
- extern void __init pxa_init_irq_gpio(int gpio_nr);
-+extern void __init pxa_init_irq_set_wake(int (*set_wake)(unsigned int, unsigned int));
- extern void __init pxa25x_init_irq(void);
- extern void __init pxa27x_init_irq(void);
-+extern void __init pxa3xx_init_irq(void);
- extern void __init pxa_map_io(void);
- 
- extern unsigned int get_clk_frequency_khz(int info);
-+extern int pxa_last_gpio;
- 
- #define SET_BANK(__nr,__start,__size) \
- 	mi->bank[__nr].start = (__start), \
- 	mi->bank[__nr].size = (__size), \
- 	mi->bank[__nr].node = (((unsigned)(__start) - PHYS_OFFSET) >> 27)
- 
-+#ifdef CONFIG_PXA25x
-+extern unsigned pxa25x_get_clk_frequency_khz(int);
-+extern unsigned pxa25x_get_memclk_frequency_10khz(void);
-+#else
-+#define pxa25x_get_clk_frequency_khz(x)		(0)
-+#define pxa25x_get_memclk_frequency_10khz()	(0)
-+#endif
-+
-+#ifdef CONFIG_PXA27x
-+extern unsigned pxa27x_get_clk_frequency_khz(int);
-+extern unsigned pxa27x_get_memclk_frequency_10khz(void);
-+#else
-+#define pxa27x_get_clk_frequency_khz(x)		(0)
-+#define pxa27x_get_memclk_frequency_10khz()	(0)
-+#endif
-+
-+#ifdef CONFIG_PXA3xx
-+extern unsigned pxa3xx_get_clk_frequency_khz(int);
-+extern unsigned pxa3xx_get_memclk_frequency_10khz(void);
-+#else
-+#define pxa3xx_get_clk_frequency_khz(x)		(0)
-+#define pxa3xx_get_memclk_frequency_10khz()	(0)
-+#endif
---- linux-2.6.23.orig/arch/arm/mach-pxa/irq.c
-+++ linux-2.6.23/arch/arm/mach-pxa/irq.c
-@@ -38,33 +38,11 @@
- 	ICMR |= (1 << irq);
- }
- 
--static int pxa_set_wake(unsigned int irq, unsigned int on)
--{
--	u32	mask;
--
--	switch (irq) {
--	case IRQ_RTCAlrm:
--		mask = PWER_RTC;
--		break;
--#ifdef CONFIG_PXA27x
--	/* REVISIT can handle USBH1, USBH2, USB, MSL, USIM, ... */
--#endif
--	default:
--		return -EINVAL;
--	}
--	if (on)
--		PWER |= mask;
--	else
--		PWER &= ~mask;
--	return 0;
--}
--
- static struct irq_chip pxa_internal_chip_low = {
- 	.name		= "SC",
- 	.ack		= pxa_mask_low_irq,
- 	.mask		= pxa_mask_low_irq,
- 	.unmask		= pxa_unmask_low_irq,
--	.set_wake	= pxa_set_wake,
- };
- 
- void __init pxa_init_irq_low(void)
-@@ -87,7 +65,7 @@
- 	}
- }
- 
--#ifdef CONFIG_PXA27x
-+#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx)
- 
- /*
-  * This is for the second set of internal IRQs as found on the PXA27x.
-@@ -125,26 +103,6 @@
- }
- #endif
- 
--/* Note that if an input/irq line ever gets changed to an output during
-- * suspend, the relevant PWER, PRER, and PFER bits should be cleared.
-- */
--#ifdef CONFIG_PXA27x
--
--/* PXA27x:  Various gpios can issue wakeup events.  This logic only
-- * handles the simple cases, not the WEMUX2 and WEMUX3 options
-- */
--#define PXA27x_GPIO_NOWAKE_MASK \
--	((1 << 8) | (1 << 7) | (1 << 6) | (1 << 5) | (1 << 2))
--#define	WAKEMASK(gpio) \
--	(((gpio) <= 15) \
--		? ((1 << (gpio)) & ~PXA27x_GPIO_NOWAKE_MASK) \
--		: ((gpio == 35) ? (1 << 24) : 0))
--#else
--
--/* pxa 210, 250, 255, 26x:  gpios 0..15 can issue wakeups */
--#define	WAKEMASK(gpio) (((gpio) <= 15) ? (1 << (gpio)) : 0)
--#endif
--
- /*
-  * PXA GPIO edge detection for IRQs:
-  * IRQs are generated on Falling-Edge, Rising-Edge, or both.
-@@ -158,11 +116,9 @@
- static int pxa_gpio_irq_type(unsigned int irq, unsigned int type)
- {
- 	int gpio, idx;
--	u32 mask;
- 
- 	gpio = IRQ_TO_GPIO(irq);
- 	idx = gpio >> 5;
--	mask = WAKEMASK(gpio);
- 
- 	if (type == IRQT_PROBE) {
- 	    /* Don't mess with enabled GPIOs using preconfigured edges or
-@@ -182,19 +138,15 @@
- 	if (type & __IRQT_RISEDGE) {
- 		/* printk("rising "); */
- 		__set_bit (gpio, GPIO_IRQ_rising_edge);
--		PRER |= mask;
- 	} else {
- 		__clear_bit (gpio, GPIO_IRQ_rising_edge);
--		PRER &= ~mask;
- 	}
- 
- 	if (type & __IRQT_FALEDGE) {
- 		/* printk("falling "); */
- 		__set_bit (gpio, GPIO_IRQ_falling_edge);
--		PFER |= mask;
- 	} else {
- 		__clear_bit (gpio, GPIO_IRQ_falling_edge);
--		PFER &= ~mask;
- 	}
- 
- 	/* printk("edges\n"); */
-@@ -213,29 +165,12 @@
- 	GEDR0 = (1 << (irq - IRQ_GPIO0));
- }
- 
--static int pxa_set_gpio_wake(unsigned int irq, unsigned int on)
--{
--	int	gpio = IRQ_TO_GPIO(irq);
--	u32	mask = WAKEMASK(gpio);
--
--	if (!mask)
--		return -EINVAL;
--
--	if (on)
--		PWER |= mask;
--	else
--		PWER &= ~mask;
--	return 0;
--}
--
--
- static struct irq_chip pxa_low_gpio_chip = {
- 	.name		= "GPIO-l",
- 	.ack		= pxa_ack_low_gpio,
- 	.mask		= pxa_mask_low_irq,
- 	.unmask		= pxa_unmask_low_irq,
- 	.set_type	= pxa_gpio_irq_type,
--	.set_wake	= pxa_set_gpio_wake,
- };
- 
- /*
-@@ -342,13 +277,14 @@
- 	.mask		= pxa_mask_muxed_gpio,
- 	.unmask		= pxa_unmask_muxed_gpio,
- 	.set_type	= pxa_gpio_irq_type,
--	.set_wake	= pxa_set_gpio_wake,
- };
- 
- void __init pxa_init_irq_gpio(int gpio_nr)
- {
- 	int irq, i;
- 
-+	pxa_last_gpio = gpio_nr - 1;
-+
- 	/* clear all GPIO edge detects */
- 	for (i = 0; i < gpio_nr; i += 32) {
- 		GFER(i) = 0;
-@@ -375,3 +311,13 @@
- 	set_irq_chip(IRQ_GPIO_2_x, &pxa_internal_chip_low);
- 	set_irq_chained_handler(IRQ_GPIO_2_x, pxa_gpio_demux_handler);
- }
-+
-+void __init pxa_init_irq_set_wake(int (*set_wake)(unsigned int, unsigned int))
-+{
-+	pxa_internal_chip_low.set_wake = set_wake;
-+#ifdef CONFIG_PXA27x
-+	pxa_internal_chip_high.set_wake = set_wake;
-+#endif
-+	pxa_low_gpio_chip.set_wake = set_wake;
-+	pxa_muxed_gpio_chip.set_wake = set_wake;
-+}
---- /dev/null
-+++ linux-2.6.23/arch/arm/mach-pxa/mfp.c
-@@ -0,0 +1,235 @@
-+/*
-+ * linux/arch/arm/mach-pxa/mfp.c
-+ *
-+ * PXA3xx Multi-Function Pin Support
-+ *
-+ * Copyright (C) 2007 Marvell Internation Ltd.
-+ *
-+ * 2007-08-21: eric miao <eric.y.miao@gmail.com>
-+ *             initial version
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License version 2 as
-+ *  published by the Free Software Foundation.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/io.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/arch/mfp.h>
-+
-+/* mfp_spin_lock is used to ensure that MFP register configuration
-+ * (most likely a read-modify-write operation) is atomic, and that
-+ * mfp_table[] is consistent
-+ */
-+static DEFINE_SPINLOCK(mfp_spin_lock);
-+
-+static void __iomem *mfpr_mmio_base = (void __iomem *)&__REG(MFPR_BASE);
-+static struct pxa3xx_mfp_pin mfp_table[MFP_PIN_MAX];
-+
-+#define mfpr_readl(off)			\
-+	__raw_readl(mfpr_mmio_base + (off))
-+
-+#define mfpr_writel(off, val)		\
-+	__raw_writel(val, mfpr_mmio_base + (off))
-+
-+/*
-+ * perform a read-back of any MFPR register to make sure the
-+ * previous writings are finished
-+ */
-+#define mfpr_sync()	(void)__raw_readl(mfpr_mmio_base + 0)
-+
-+static inline void __mfp_config(int pin, unsigned long val)
-+{
-+	unsigned long off = mfp_table[pin].mfpr_off;
-+
-+	mfp_table[pin].mfpr_val = val;
-+	mfpr_writel(off, val);
-+}
-+
-+void pxa3xx_mfp_config(mfp_cfg_t *mfp_cfgs, int num)
-+{
-+	int i, pin;
-+	unsigned long val, flags;
-+	mfp_cfg_t *mfp_cfg = mfp_cfgs;
-+
-+	spin_lock_irqsave(&mfp_spin_lock, flags);
-+
-+	for (i = 0; i < num; i++, mfp_cfg++) {
-+		pin = MFP_CFG_PIN(*mfp_cfg);
-+		val = MFP_CFG_VAL(*mfp_cfg);
-+
-+		BUG_ON(pin >= MFP_PIN_MAX);
-+
-+		__mfp_config(pin, val);
-+	}
-+
-+	mfpr_sync();
-+	spin_unlock_irqrestore(&mfp_spin_lock, flags);
-+}
-+
-+unsigned long pxa3xx_mfp_read(int mfp)
-+{
-+	unsigned long val, flags;
-+
-+	BUG_ON(mfp >= MFP_PIN_MAX);
-+
-+	spin_lock_irqsave(&mfp_spin_lock, flags);
-+	val = mfpr_readl(mfp_table[mfp].mfpr_off);
-+	spin_unlock_irqrestore(&mfp_spin_lock, flags);
-+
-+	return val;
-+}
-+
-+void pxa3xx_mfp_write(int mfp, unsigned long val)
-+{
-+	unsigned long flags;
-+
-+	BUG_ON(mfp >= MFP_PIN_MAX);
-+
-+	spin_lock_irqsave(&mfp_spin_lock, flags);
-+	mfpr_writel(mfp_table[mfp].mfpr_off, val);
-+	mfpr_sync();
-+	spin_unlock_irqrestore(&mfp_spin_lock, flags);
-+}
-+
-+void pxa3xx_mfp_set_afds(int mfp, int af, int ds)
-+{
-+	uint32_t mfpr_off, mfpr_val;
-+	unsigned long flags;
-+
-+	BUG_ON(mfp >= MFP_PIN_MAX);
-+
-+	spin_lock_irqsave(&mfp_spin_lock, flags);
-+	mfpr_off = mfp_table[mfp].mfpr_off;
-+
-+	mfpr_val = mfpr_readl(mfpr_off);
-+	mfpr_val &= ~(MFPR_AF_MASK | MFPR_DRV_MASK);
-+	mfpr_val |= (((af & 0x7) << MFPR_ALT_OFFSET) |
-+		     ((ds & 0x7) << MFPR_DRV_OFFSET));
-+
-+	mfpr_writel(mfpr_off, mfpr_val);
-+	mfpr_sync();
-+
-+	spin_unlock_irqrestore(&mfp_spin_lock, flags);
-+}
-+
-+void pxa3xx_mfp_set_rdh(int mfp, int rdh)
-+{
-+	uint32_t mfpr_off, mfpr_val;
-+	unsigned long flags;
-+
-+	BUG_ON(mfp >= MFP_PIN_MAX);
-+
-+	spin_lock_irqsave(&mfp_spin_lock, flags);
-+
-+	mfpr_off = mfp_table[mfp].mfpr_off;
-+
-+	mfpr_val = mfpr_readl(mfpr_off);
-+	mfpr_val &= ~MFPR_RDH_MASK;
-+
-+	if (likely(rdh))
-+		mfpr_val |= (1u << MFPR_SS_OFFSET);
-+
-+	mfpr_writel(mfpr_off, mfpr_val);
-+	mfpr_sync();
-+
-+	spin_unlock_irqrestore(&mfp_spin_lock, flags);
-+}
-+
-+void pxa3xx_mfp_set_lpm(int mfp, int lpm)
-+{
-+	uint32_t mfpr_off, mfpr_val;
-+	unsigned long flags;
-+
-+	BUG_ON(mfp >= MFP_PIN_MAX);
-+
-+	spin_lock_irqsave(&mfp_spin_lock, flags);
-+
-+	mfpr_off = mfp_table[mfp].mfpr_off;
-+	mfpr_val = mfpr_readl(mfpr_off);
-+	mfpr_val &= ~MFPR_LPM_MASK;
-+
-+	if (lpm & 0x1) mfpr_val |= 1u << MFPR_SON_OFFSET;
-+	if (lpm & 0x2) mfpr_val |= 1u << MFPR_SD_OFFSET;
-+	if (lpm & 0x4) mfpr_val |= 1u << MFPR_PU_OFFSET;
-+	if (lpm & 0x8) mfpr_val |= 1u << MFPR_PD_OFFSET;
-+	if (lpm &0x10) mfpr_val |= 1u << MFPR_PS_OFFSET;
-+
-+	mfpr_writel(mfpr_off, mfpr_val);
-+	mfpr_sync();
-+
-+	spin_unlock_irqrestore(&mfp_spin_lock, flags);
-+}
-+
-+void pxa3xx_mfp_set_pull(int mfp, int pull)
-+{
-+	uint32_t mfpr_off, mfpr_val;
-+	unsigned long flags;
-+
-+	BUG_ON(mfp >= MFP_PIN_MAX);
-+
-+	spin_lock_irqsave(&mfp_spin_lock, flags);
-+
-+	mfpr_off = mfp_table[mfp].mfpr_off;
-+	mfpr_val = mfpr_readl(mfpr_off);
-+	mfpr_val &= ~MFPR_PULL_MASK;
-+	mfpr_val |= ((pull & 0x7u) << MFPR_PD_OFFSET);
-+
-+	mfpr_writel(mfpr_off, mfpr_val);
-+	mfpr_sync();
-+
-+	spin_unlock_irqrestore(&mfp_spin_lock, flags);
-+}
-+
-+void pxa3xx_mfp_set_edge(int mfp, int edge)
-+{
-+	uint32_t mfpr_off, mfpr_val;
-+	unsigned long flags;
-+
-+	BUG_ON(mfp >= MFP_PIN_MAX);
-+
-+	spin_lock_irqsave(&mfp_spin_lock, flags);
-+
-+	mfpr_off = mfp_table[mfp].mfpr_off;
-+	mfpr_val = mfpr_readl(mfpr_off);
-+
-+	mfpr_val &= ~MFPR_EDGE_MASK;
-+	mfpr_val |= (edge & 0x3u) << MFPR_ERE_OFFSET;
-+	mfpr_val |= (!edge & 0x1) << MFPR_EC_OFFSET;
-+
-+	mfpr_writel(mfpr_off, mfpr_val);
-+	mfpr_sync();
-+
-+	spin_unlock_irqrestore(&mfp_spin_lock, flags);
-+}
-+
-+void __init pxa3xx_mfp_init_addr(struct pxa3xx_mfp_addr_map *map)
-+{
-+	struct pxa3xx_mfp_addr_map *p;
-+	unsigned long offset, flags;
-+	int i;
-+
-+	spin_lock_irqsave(&mfp_spin_lock, flags);
-+
-+	for (p = map; p->start != MFP_PIN_INVALID; p++) {
-+		offset = p->offset;
-+		i = p->start;
-+
-+		do {
-+			mfp_table[i].mfpr_off = offset;
-+			mfp_table[i].mfpr_val = 0;
-+			offset += 4; i++;
-+		} while ((i <= p->end) && (p->end != -1));
-+	}
-+
-+	spin_unlock_irqrestore(&mfp_spin_lock, flags);
-+}
-+
-+void __init pxa3xx_init_mfp(void)
-+{
-+	memset(mfp_table, 0, sizeof(mfp_table));
-+}
---- linux-2.6.23.orig/arch/arm/mach-pxa/pxa25x.c
-+++ linux-2.6.23/arch/arm/mach-pxa/pxa25x.c
-@@ -30,6 +30,7 @@
- 
- #include "generic.h"
- #include "devices.h"
-+#include "clock.h"
- 
- /*
-  * Various clock factors driven by the CCCR register.
-@@ -53,7 +54,7 @@
-  * We assume these values have been applied via a fcs.
-  * If info is not 0 we also display the current settings.
-  */
--unsigned int get_clk_frequency_khz(int info)
-+unsigned int pxa25x_get_clk_frequency_khz(int info)
- {
- 	unsigned long cccr, turbo;
- 	unsigned int l, L, m, M, n2, N;
-@@ -86,27 +87,48 @@
- 	return (turbo & 1) ? (N/1000) : (M/1000);
- }
- 
--EXPORT_SYMBOL(get_clk_frequency_khz);
--
- /*
-  * Return the current memory clock frequency in units of 10kHz
-  */
--unsigned int get_memclk_frequency_10khz(void)
-+unsigned int pxa25x_get_memclk_frequency_10khz(void)
- {
- 	return L_clk_mult[(CCCR >> 0) & 0x1f] * BASE_CLK / 10000;
- }
- 
--EXPORT_SYMBOL(get_memclk_frequency_10khz);
--
--/*
-- * Return the current LCD clock frequency in units of 10kHz
-- */
--unsigned int get_lcdclk_frequency_10khz(void)
-+static unsigned long clk_pxa25x_lcd_getrate(struct clk *clk)
- {
--	return get_memclk_frequency_10khz();
-+	return pxa25x_get_memclk_frequency_10khz() * 10000;
- }
- 
--EXPORT_SYMBOL(get_lcdclk_frequency_10khz);
-+static const struct clkops clk_pxa25x_lcd_ops = {
-+	.enable		= clk_cken_enable,
-+	.disable	= clk_cken_disable,
-+	.getrate	= clk_pxa25x_lcd_getrate,
-+};
-+
-+/*
-+ * 3.6864MHz -> OST, GPIO, SSP, PWM, PLLs (95.842MHz, 147.456MHz)
-+ * 95.842MHz -> MMC 19.169MHz, I2C 31.949MHz, FICP 47.923MHz, USB 47.923MHz
-+ * 147.456MHz -> UART 14.7456MHz, AC97 12.288MHz, I2S 5.672MHz (allegedly)
-+ */
-+static struct clk pxa25x_clks[] = {
-+	INIT_CK("LCDCLK", LCD, &clk_pxa25x_lcd_ops, &pxa_device_fb.dev),
-+	INIT_CKEN("UARTCLK", FFUART, 14745600, 1, &pxa_device_ffuart.dev),
-+	INIT_CKEN("UARTCLK", BTUART, 14745600, 1, &pxa_device_btuart.dev),
-+	INIT_CKEN("UARTCLK", BTUART, 14745600, 1, &pxa_device_btuart.dev),
-+	INIT_CKEN("UARTCLK", STUART, 14745600, 1, NULL),
-+	INIT_CKEN("UDCCLK", USB, 47923000, 5, &pxa_device_udc.dev),
-+	INIT_CKEN("MMCCLK", MMC, 19169000, 0, &pxa_device_mci.dev),
-+	INIT_CKEN("I2CCLK", I2C, 31949000, 0, &pxa_device_i2c.dev),
-+	/*
-+	INIT_CKEN("PWMCLK",  PWM0, 3686400,  0, NULL),
-+	INIT_CKEN("PWMCLK",  PWM0, 3686400,  0, NULL),
-+	INIT_CKEN("SSPCLK",  SSP,  3686400,  0, NULL),
-+	INIT_CKEN("I2SCLK",  I2S,  14745600, 0, NULL),
-+	INIT_CKEN("NSSPCLK", NSSP, 3686400,  0, NULL),
-+	*/
-+	INIT_CKEN("FICPCLK", FICP, 47923000, 0, NULL),
-+};
- 
- #ifdef CONFIG_PM
- 
-@@ -207,10 +229,52 @@
- }
- #endif
- 
-+/* PXA25x: supports wakeup from GPIO0..GPIO15 and RTC alarm
-+ */
-+
-+static int pxa25x_set_wake(unsigned int irq, unsigned int on)
-+{
-+	int gpio = IRQ_TO_GPIO(irq);
-+	uint32_t gpio_bit, mask = 0;
-+
-+	if (gpio >= 0 && gpio <= 15) {
-+		gpio_bit = GPIO_bit(gpio);
-+		mask = gpio_bit;
-+		if (on) {
-+			if (GRER(gpio) | gpio_bit)
-+				PRER |= gpio_bit;
-+			else
-+				PRER &= ~gpio_bit;
-+
-+			if (GFER(gpio) | gpio_bit)
-+				PFER |= gpio_bit;
-+			else
-+				PFER &= ~gpio_bit;
-+		}
-+		goto set_pwer;
-+	}
-+
-+	if (irq == IRQ_RTCAlrm) {
-+		mask = PWER_RTC;
-+		goto set_pwer;
-+	}
-+
-+	return -EINVAL;
-+
-+set_pwer:
-+	if (on)
-+		PWER |= mask;
-+	else
-+		PWER &=~mask;
-+
-+	return 0;
-+}
-+
- void __init pxa25x_init_irq(void)
- {
- 	pxa_init_irq_low();
- 	pxa_init_irq_gpio(85);
-+	pxa_init_irq_set_wake(pxa25x_set_wake);
- }
- 
- static struct platform_device *pxa25x_devices[] __initdata = {
-@@ -231,6 +295,8 @@
- 	int ret = 0;
- 
- 	if (cpu_is_pxa21x() || cpu_is_pxa25x()) {
-+		clks_register(pxa25x_clks, ARRAY_SIZE(pxa25x_clks));
-+
- 		if ((ret = pxa_init_dma(16)))
- 			return ret;
- #ifdef CONFIG_PM
---- linux-2.6.23.orig/arch/arm/mach-pxa/pxa27x.c
-+++ linux-2.6.23/arch/arm/mach-pxa/pxa27x.c
-@@ -27,6 +27,7 @@
- 
- #include "generic.h"
- #include "devices.h"
-+#include "clock.h"
- 
- /* Crystal clock: 13MHz */
- #define BASE_CLK	13000000
-@@ -36,7 +37,7 @@
-  * We assume these values have been applied via a fcs.
-  * If info is not 0 we also display the current settings.
-  */
--unsigned int get_clk_frequency_khz( int info)
-+unsigned int pxa27x_get_clk_frequency_khz(int info)
- {
- 	unsigned long ccsr, clkcfg;
- 	unsigned int l, L, m, M, n2, N, S;
-@@ -79,7 +80,7 @@
-  * Return the current mem clock frequency in units of 10kHz as
-  * reflected by CCCR[A], B, and L
-  */
--unsigned int get_memclk_frequency_10khz(void)
-+unsigned int pxa27x_get_memclk_frequency_10khz(void)
- {
- 	unsigned long ccsr, clkcfg;
- 	unsigned int l, L, m, M;
-@@ -104,7 +105,7 @@
- /*
-  * Return the current LCD clock frequency in units of 10kHz as
-  */
--unsigned int get_lcdclk_frequency_10khz(void)
-+static unsigned int pxa27x_get_lcdclk_frequency_10khz(void)
- {
- 	unsigned long ccsr;
- 	unsigned int l, L, k, K;
-@@ -120,9 +121,47 @@
- 	return (K / 10000);
- }
- 
--EXPORT_SYMBOL(get_clk_frequency_khz);
--EXPORT_SYMBOL(get_memclk_frequency_10khz);
--EXPORT_SYMBOL(get_lcdclk_frequency_10khz);
-+static unsigned long clk_pxa27x_lcd_getrate(struct clk *clk)
-+{
-+	return pxa27x_get_lcdclk_frequency_10khz() * 10000;
-+}
-+
-+static const struct clkops clk_pxa27x_lcd_ops = {
-+	.enable		= clk_cken_enable,
-+	.disable	= clk_cken_disable,
-+	.getrate	= clk_pxa27x_lcd_getrate,
-+};
-+
-+static struct clk pxa27x_clks[] = {
-+	INIT_CK("LCDCLK", LCD,    &clk_pxa27x_lcd_ops, &pxa_device_fb.dev),
-+	INIT_CK("CAMCLK", CAMERA, &clk_pxa27x_lcd_ops, NULL),
-+
-+	INIT_CKEN("UARTCLK", FFUART, 14857000, 1, &pxa_device_ffuart.dev),
-+	INIT_CKEN("UARTCLK", BTUART, 14857000, 1, &pxa_device_btuart.dev),
-+	INIT_CKEN("UARTCLK", STUART, 14857000, 1, NULL),
-+
-+	INIT_CKEN("I2SCLK",  I2S,  14682000, 0, &pxa_device_i2s.dev),
-+	INIT_CKEN("I2CCLK",  I2C,  32842000, 0, &pxa_device_i2c.dev),
-+	INIT_CKEN("UDCCLK",  USB,  48000000, 5, &pxa_device_udc.dev),
-+	INIT_CKEN("MMCCLK",  MMC,  19500000, 0, &pxa_device_mci.dev),
-+	INIT_CKEN("FICPCLK", FICP, 48000000, 0, &pxa_device_ficp.dev),
-+
-+	INIT_CKEN("USBCLK", USB,    48000000, 0, &pxa27x_device_ohci.dev),
-+	INIT_CKEN("I2CCLK", PWRI2C, 13000000, 0, &pxa27x_device_i2c_power.dev),
-+	INIT_CKEN("KBDCLK", KEYPAD, 32768, 0, NULL),
-+
-+	/*
-+	INIT_CKEN("PWMCLK",  PWM0, 13000000, 0, NULL),
-+	INIT_CKEN("SSPCLK",  SSP1, 13000000, 0, NULL),
-+	INIT_CKEN("SSPCLK",  SSP2, 13000000, 0, NULL),
-+	INIT_CKEN("SSPCLK",  SSP3, 13000000, 0, NULL),
-+	INIT_CKEN("MSLCLK",  MSL,  48000000, 0, NULL),
-+	INIT_CKEN("USIMCLK", USIM, 48000000, 0, NULL),
-+	INIT_CKEN("MSTKCLK", MEMSTK, 19500000, 0, NULL),
-+	INIT_CKEN("IMCLK",   IM,   0, 0, NULL),
-+	INIT_CKEN("MEMCLK",  MEMC, 0, 0, NULL),
-+	*/
-+};
- 
- #ifdef CONFIG_PM
- 
-@@ -269,6 +308,69 @@
- }
- #endif
- 
-+/* PXA27x:  Various gpios can issue wakeup events.  This logic only
-+ * handles the simple cases, not the WEMUX2 and WEMUX3 options
-+ */
-+#define PXA27x_GPIO_NOWAKE_MASK \
-+        ((1 << 8) | (1 << 7) | (1 << 6) | (1 << 5) | (1 << 2))
-+#define WAKEMASK(gpio) \
-+        (((gpio) <= 15) \
-+                 ? ((1 << (gpio)) & ~PXA27x_GPIO_NOWAKE_MASK) \
-+                 : ((gpio == 35) ? (1 << 24) : 0))
-+
-+static int pxa27x_set_wake(unsigned int irq, unsigned int on)
-+{
-+	int gpio = IRQ_TO_GPIO(irq);
-+	uint32_t mask;
-+
-+	if ((gpio >= 0 && gpio <= 15) || (gpio == 35)) {
-+		if (WAKEMASK(gpio) == 0)
-+			return -EINVAL;
-+
-+		mask = WAKEMASK(gpio);
-+
-+		if (on) {
-+			if (GRER(gpio) | GPIO_bit(gpio))
-+				PRER |= mask;
-+			else
-+				PRER &= ~mask;
-+
-+			if (GFER(gpio) | GPIO_bit(gpio))
-+				PFER |= mask;
-+			else
-+				PFER &= ~mask;
-+		}
-+		goto set_pwer;
-+	}
-+
-+	switch (irq) {
-+	case IRQ_RTCAlrm:
-+		mask = PWER_RTC;
-+		break;
-+	case IRQ_USB:
-+		mask = 1u << 26;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+set_pwer:
-+	if (on)
-+		PWER |= mask;
-+	else
-+		PWER &=~mask;
-+
-+	return 0;
-+}
-+
-+void __init pxa27x_init_irq(void)
-+{
-+	pxa_init_irq_low();
-+	pxa_init_irq_high();
-+	pxa_init_irq_gpio(128);
-+	pxa_init_irq_set_wake(pxa27x_set_wake);
-+}
-+
- /*
-  * device registration specific to PXA27x.
-  */
-@@ -288,7 +390,7 @@
- 	},
- };
- 
--static struct platform_device pxa27x_device_ohci = {
-+struct platform_device pxa27x_device_ohci = {
- 	.name		= "pxa27x-ohci",
- 	.id		= -1,
- 	.dev		= {
-@@ -316,7 +418,7 @@
- 	},
- };
- 
--static struct platform_device pxa27x_device_i2c_power = {
-+struct platform_device pxa27x_device_i2c_power = {
- 	.name		= "pxa2xx-i2c",
- 	.id		= 1,
- 	.resource	= i2c_power_resources,
-@@ -338,17 +440,12 @@
- 	&pxa27x_device_ohci,
- };
- 
--void __init pxa27x_init_irq(void)
--{
--	pxa_init_irq_low();
--	pxa_init_irq_high();
--	pxa_init_irq_gpio(128);
--}
--
- static int __init pxa27x_init(void)
- {
- 	int ret = 0;
- 	if (cpu_is_pxa27x()) {
-+		clks_register(pxa27x_clks, ARRAY_SIZE(pxa27x_clks));
-+
- 		if ((ret = pxa_init_dma(32)))
- 			return ret;
- #ifdef CONFIG_PM
---- /dev/null
-+++ linux-2.6.23/arch/arm/mach-pxa/pxa300.c
-@@ -0,0 +1,93 @@
-+/*
-+ * linux/arch/arm/mach-pxa/pxa300.c
-+ *
-+ * Code specific to PXA300/PXA310
-+ *
-+ * Copyright (C) 2007 Marvell Internation Ltd.
-+ *
-+ * 2007-08-21: eric miao <eric.y.miao@gmail.com>
-+ *             initial version
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/arch/mfp-pxa300.h>
-+
-+static struct pxa3xx_mfp_addr_map pxa300_mfp_addr_map[] __initdata = {
-+
-+	MFP_ADDR_X(GPIO0,   GPIO2,   0x00b4),
-+	MFP_ADDR_X(GPIO3,   GPIO26,  0x027c),
-+	MFP_ADDR_X(GPIO27,  GPIO127, 0x0400),
-+	MFP_ADDR_X(GPIO0_2, GPIO6_2, 0x02ec),
-+
-+	MFP_ADDR(nBE0, 0x0204),
-+	MFP_ADDR(nBE1, 0x0208),
-+
-+	MFP_ADDR(nLUA, 0x0244),
-+	MFP_ADDR(nLLA, 0x0254),
-+
-+	MFP_ADDR(DF_CLE_nOE, 0x0240),
-+	MFP_ADDR(DF_nRE_nOE, 0x0200),
-+	MFP_ADDR(DF_ALE_nWE, 0x020C),
-+	MFP_ADDR(DF_INT_RnB, 0x00C8),
-+	MFP_ADDR(DF_nCS0, 0x0248),
-+	MFP_ADDR(DF_nCS1, 0x0278),
-+	MFP_ADDR(DF_nWE, 0x00CC),
-+
-+	MFP_ADDR(DF_ADDR0, 0x0210),
-+	MFP_ADDR(DF_ADDR1, 0x0214),
-+	MFP_ADDR(DF_ADDR2, 0x0218),
-+	MFP_ADDR(DF_ADDR3, 0x021C),
-+
-+	MFP_ADDR(DF_IO0, 0x0220),
-+	MFP_ADDR(DF_IO1, 0x0228),
-+	MFP_ADDR(DF_IO2, 0x0230),
-+	MFP_ADDR(DF_IO3, 0x0238),
-+	MFP_ADDR(DF_IO4, 0x0258),
-+	MFP_ADDR(DF_IO5, 0x0260),
-+	MFP_ADDR(DF_IO6, 0x0268),
-+	MFP_ADDR(DF_IO7, 0x0270),
-+	MFP_ADDR(DF_IO8, 0x0224),
-+	MFP_ADDR(DF_IO9, 0x022C),
-+	MFP_ADDR(DF_IO10, 0x0234),
-+	MFP_ADDR(DF_IO11, 0x023C),
-+	MFP_ADDR(DF_IO12, 0x025C),
-+	MFP_ADDR(DF_IO13, 0x0264),
-+	MFP_ADDR(DF_IO14, 0x026C),
-+	MFP_ADDR(DF_IO15, 0x0274),
-+
-+	MFP_ADDR_END,
-+};
-+
-+/* override pxa300 MFP register addresses */
-+static struct pxa3xx_mfp_addr_map pxa310_mfp_addr_map[] __initdata = {
-+	MFP_ADDR_X(GPIO30,  GPIO98,   0x0418),
-+	MFP_ADDR_X(GPIO7_2, GPIO12_2, 0x052C),
-+
-+	MFP_ADDR(ULPI_STP, 0x040C),
-+	MFP_ADDR(ULPI_NXT, 0x0410),
-+	MFP_ADDR(ULPI_DIR, 0x0414),
-+
-+	MFP_ADDR_END,
-+};
-+
-+static int __init pxa300_init(void)
-+{
-+	if (cpu_is_pxa300() || cpu_is_pxa310()) {
-+		pxa3xx_init_mfp();
-+		pxa3xx_mfp_init_addr(pxa300_mfp_addr_map);
-+	}
-+
-+	if (cpu_is_pxa310())
-+		pxa3xx_mfp_init_addr(pxa310_mfp_addr_map);
-+
-+	return 0;
-+}
-+
-+core_initcall(pxa300_init);
---- /dev/null
-+++ linux-2.6.23/arch/arm/mach-pxa/pxa320.c
-@@ -0,0 +1,88 @@
-+/*
-+ * linux/arch/arm/mach-pxa/pxa320.c
-+ *
-+ * Code specific to PXA320
-+ *
-+ * Copyright (C) 2007 Marvell Internation Ltd.
-+ *
-+ * 2007-08-21: eric miao <eric.y.miao@gmail.com>
-+ *             initial version
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/arch/mfp.h>
-+#include <asm/arch/mfp-pxa320.h>
-+
-+static struct pxa3xx_mfp_addr_map pxa320_mfp_addr_map[] __initdata = {
-+
-+	MFP_ADDR_X(GPIO0,  GPIO4,   0x0124),
-+	MFP_ADDR_X(GPIO5,  GPIO26,  0x028C),
-+	MFP_ADDR_X(GPIO27, GPIO62,  0x0400),
-+	MFP_ADDR_X(GPIO63, GPIO73,  0x04B4),
-+	MFP_ADDR_X(GPIO74, GPIO98,  0x04F0),
-+	MFP_ADDR_X(GPIO99, GPIO127, 0x0600),
-+	MFP_ADDR_X(GPIO0_2,  GPIO5_2,   0x0674),
-+	MFP_ADDR_X(GPIO6_2,  GPIO13_2,  0x0494),
-+	MFP_ADDR_X(GPIO14_2, GPIO17_2, 0x04E0),
-+
-+	MFP_ADDR(nXCVREN, 0x0138),
-+	MFP_ADDR(DF_CLE_nOE, 0x0204),
-+	MFP_ADDR(DF_nADV1_ALE, 0x0208),
-+	MFP_ADDR(DF_SCLK_S, 0x020C),
-+	MFP_ADDR(DF_SCLK_E, 0x0210),
-+	MFP_ADDR(nBE0, 0x0214),
-+	MFP_ADDR(nBE1, 0x0218),
-+	MFP_ADDR(DF_nADV2_ALE, 0x021C),
-+	MFP_ADDR(DF_INT_RnB, 0x0220),
-+	MFP_ADDR(DF_nCS0, 0x0224),
-+	MFP_ADDR(DF_nCS1, 0x0228),
-+	MFP_ADDR(DF_nWE, 0x022C),
-+	MFP_ADDR(DF_nRE_nOE, 0x0230),
-+	MFP_ADDR(nLUA, 0x0234),
-+	MFP_ADDR(nLLA, 0x0238),
-+	MFP_ADDR(DF_ADDR0, 0x023C),
-+	MFP_ADDR(DF_ADDR1, 0x0240),
-+	MFP_ADDR(DF_ADDR2, 0x0244),
-+	MFP_ADDR(DF_ADDR3, 0x0248),
-+	MFP_ADDR(DF_IO0, 0x024C),
-+	MFP_ADDR(DF_IO8, 0x0250),
-+	MFP_ADDR(DF_IO1, 0x0254),
-+	MFP_ADDR(DF_IO9, 0x0258),
-+	MFP_ADDR(DF_IO2, 0x025C),
-+	MFP_ADDR(DF_IO10, 0x0260),
-+	MFP_ADDR(DF_IO3, 0x0264),
-+	MFP_ADDR(DF_IO11, 0x0268),
-+	MFP_ADDR(DF_IO4, 0x026C),
-+	MFP_ADDR(DF_IO12, 0x0270),
-+	MFP_ADDR(DF_IO5, 0x0274),
-+	MFP_ADDR(DF_IO13, 0x0278),
-+	MFP_ADDR(DF_IO6, 0x027C),
-+	MFP_ADDR(DF_IO14, 0x0280),
-+	MFP_ADDR(DF_IO7, 0x0284),
-+	MFP_ADDR(DF_IO15, 0x0288),
-+
-+	MFP_ADDR_END,
-+};
-+
-+static void __init pxa320_init_mfp(void)
-+{
-+	pxa3xx_init_mfp();
-+	pxa3xx_mfp_init_addr(pxa320_mfp_addr_map);
-+}
-+
-+static int __init pxa320_init(void)
-+{
-+	if (cpu_is_pxa320())
-+		pxa320_init_mfp();
-+
-+	return 0;
-+}
-+
-+core_initcall(pxa320_init);
---- /dev/null
-+++ linux-2.6.23/arch/arm/mach-pxa/pxa3xx.c
-@@ -0,0 +1,216 @@
-+/*
-+ * linux/arch/arm/mach-pxa/pxa3xx.c
-+ *
-+ * code specific to pxa3xx aka Monahans
-+ *
-+ * Copyright (C) 2006 Marvell International Ltd.
-+ *
-+ * 2007-09-02: eric miao <eric.y.miao@gmail.com>
-+ *             initial version
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/pm.h>
-+#include <linux/platform_device.h>
-+#include <linux/irq.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/arch/pxa3xx-regs.h>
-+#include <asm/arch/ohci.h>
-+#include <asm/arch/pm.h>
-+#include <asm/arch/dma.h>
-+#include <asm/arch/ssp.h>
-+
-+#include "generic.h"
-+#include "devices.h"
-+#include "clock.h"
-+
-+/* Crystal clock: 13MHz */
-+#define BASE_CLK	13000000
-+
-+/* Ring Oscillator Clock: 60MHz */
-+#define RO_CLK		60000000
-+
-+#define ACCR_D0CS	(1 << 26)
-+
-+/* crystal frequency to static memory controller multiplier (SMCFS) */
-+static unsigned char smcfs_mult[8] = { 6, 0, 8, 0, 0, 16, };
-+
-+/* crystal frequency to HSIO bus frequency multiplier (HSS) */
-+static unsigned char hss_mult[4] = { 8, 12, 16, 0 };
-+
-+/*
-+ * Get the clock frequency as reflected by CCSR and the turbo flag.
-+ * We assume these values have been applied via a fcs.
-+ * If info is not 0 we also display the current settings.
-+ */
-+unsigned int pxa3xx_get_clk_frequency_khz(int info)
-+{
-+	unsigned long acsr, xclkcfg;
-+	unsigned int t, xl, xn, hss, ro, XL, XN, CLK, HSS;
-+
-+	/* Read XCLKCFG register turbo bit */
-+	__asm__ __volatile__("mrc\tp14, 0, %0, c6, c0, 0" : "=r"(xclkcfg));
-+	t = xclkcfg & 0x1;
-+
-+	acsr = ACSR;
-+
-+	xl  = acsr & 0x1f;
-+	xn  = (acsr >> 8) & 0x7;
-+	hss = (acsr >> 14) & 0x3;
-+
-+	XL = xl * BASE_CLK;
-+	XN = xn * XL;
-+
-+	ro = acsr & ACCR_D0CS;
-+
-+	CLK = (ro) ? RO_CLK : ((t) ? XN : XL);
-+	HSS = (ro) ? RO_CLK : hss_mult[hss] * BASE_CLK;
-+
-+	if (info) {
-+		pr_info("RO Mode clock: %d.%02dMHz (%sactive)\n",
-+			RO_CLK / 1000000, (RO_CLK % 1000000) / 10000,
-+			(ro) ? "" : "in");
-+		pr_info("Run Mode clock: %d.%02dMHz (*%d)\n",
-+			XL / 1000000, (XL % 1000000) / 10000, xl);
-+		pr_info("Turbo Mode clock: %d.%02dMHz (*%d, %sactive)\n",
-+			XN / 1000000, (XN % 1000000) / 10000, xn,
-+			(t) ? "" : "in");
-+		pr_info("HSIO bus clock: %d.%02dMHz\n",
-+			HSS / 1000000, (HSS % 1000000) / 10000);
-+	}
-+
-+	return CLK;
-+}
-+
-+/*
-+ * Return the current static memory controller clock frequency
-+ * in units of 10kHz
-+ */
-+unsigned int pxa3xx_get_memclk_frequency_10khz(void)
-+{
-+	unsigned long acsr;
-+	unsigned int smcfs, clk = 0;
-+
-+	acsr = ACSR;
-+
-+	smcfs = (acsr >> 23) & 0x7;
-+	clk = (acsr & ACCR_D0CS) ? RO_CLK : smcfs_mult[smcfs] * BASE_CLK;
-+
-+	return (clk / 10000);
-+}
-+
-+/*
-+ * Return the current HSIO bus clock frequency
-+ */
-+static unsigned long clk_pxa3xx_hsio_getrate(struct clk *clk)
-+{
-+	unsigned long acsr;
-+	unsigned int hss, hsio_clk;
-+
-+	acsr = ACSR;
-+
-+	hss = (acsr >> 14) & 0x3;
-+	hsio_clk = (acsr & ACCR_D0CS) ? RO_CLK : hss_mult[hss] * BASE_CLK;
-+
-+	return hsio_clk;
-+}
-+
-+static void clk_pxa3xx_cken_enable(struct clk *clk)
-+{
-+	unsigned long mask = 1ul << (clk->cken & 0x1f);
-+
-+	local_irq_disable();
-+
-+	if (clk->cken < 32)
-+		CKENA |= mask;
-+	else
-+		CKENB |= mask;
-+
-+	local_irq_enable();
-+}
-+
-+static void clk_pxa3xx_cken_disable(struct clk *clk)
-+{
-+	unsigned long mask = 1ul << (clk->cken & 0x1f);
-+
-+	local_irq_disable();
-+
-+	if (clk->cken < 32)
-+		CKENA &= ~mask;
-+	else
-+		CKENB &= ~mask;
-+
-+	local_irq_enable();
-+}
-+
-+static const struct clkops clk_pxa3xx_hsio_ops = {
-+	.enable		= clk_pxa3xx_cken_enable,
-+	.disable	= clk_pxa3xx_cken_disable,
-+	.getrate	= clk_pxa3xx_hsio_getrate,
-+};
-+
-+static struct clk pxa3xx_clks[] = {
-+	INIT_CK("LCDCLK", LCD,    &clk_pxa3xx_hsio_ops, &pxa_device_fb.dev),
-+	INIT_CK("CAMCLK", CAMERA, &clk_pxa3xx_hsio_ops, NULL),
-+
-+	INIT_CKEN("UARTCLK", FFUART, 14857000, 1, &pxa_device_ffuart.dev),
-+	INIT_CKEN("UARTCLK", BTUART, 14857000, 1, &pxa_device_btuart.dev),
-+	INIT_CKEN("UARTCLK", STUART, 14857000, 1, NULL),
-+
-+	INIT_CKEN("I2CCLK",  I2C,  32842000, 0, &pxa_device_i2c.dev),
-+	INIT_CKEN("UDCCLK",  UDC,  48000000, 5, &pxa_device_udc.dev),
-+};
-+
-+void __init pxa3xx_init_irq(void)
-+{
-+	/* enable CP6 access */
-+	u32 value;
-+	__asm__ __volatile__("mrc p15, 0, %0, c15, c1, 0\n": "=r"(value));
-+	value |= (1 << 6);
-+	__asm__ __volatile__("mcr p15, 0, %0, c15, c1, 0\n": :"r"(value));
-+
-+	pxa_init_irq_low();
-+	pxa_init_irq_high();
-+	pxa_init_irq_gpio(128);
-+}
-+
-+/*
-+ * device registration specific to PXA3xx.
-+ */
-+
-+static struct platform_device *devices[] __initdata = {
-+	&pxa_device_mci,
-+	&pxa_device_udc,
-+	&pxa_device_fb,
-+	&pxa_device_ffuart,
-+	&pxa_device_btuart,
-+	&pxa_device_stuart,
-+	&pxa_device_i2c,
-+	&pxa_device_i2s,
-+	&pxa_device_ficp,
-+	&pxa_device_rtc,
-+};
-+
-+static int __init pxa3xx_init(void)
-+{
-+	int ret = 0;
-+
-+	if (cpu_is_pxa3xx()) {
-+		clks_register(pxa3xx_clks, ARRAY_SIZE(pxa3xx_clks));
-+
-+		if ((ret = pxa_init_dma(32)))
-+			return ret;
-+
-+		return platform_add_devices(devices, ARRAY_SIZE(devices));
-+	}
-+	return 0;
-+}
-+
-+subsys_initcall(pxa3xx_init);
---- linux-2.6.23.orig/arch/arm/mach-pxa/time.c
-+++ linux-2.6.23/arch/arm/mach-pxa/time.c
-@@ -16,10 +16,48 @@
- #include <linux/init.h>
- #include <linux/interrupt.h>
- #include <linux/clockchips.h>
-+#include <linux/sched.h>
- 
-+#include <asm/div64.h>
-+#include <asm/cnt32_to_63.h>
- #include <asm/mach/irq.h>
- #include <asm/mach/time.h>
- #include <asm/arch/pxa-regs.h>
-+#include <asm/mach-types.h>
-+
-+/*
-+ * This is PXA's sched_clock implementation. This has a resolution
-+ * of at least 308 ns and a maximum value of 208 days.
-+ *
-+ * The return value is guaranteed to be monotonic in that range as
-+ * long as there is always less than 582 seconds between successive
-+ * calls to sched_clock() which should always be the case in practice.
-+ */
-+
-+#define OSCR2NS_SCALE_FACTOR 10
-+
-+static unsigned long oscr2ns_scale;
-+
-+static void __init set_oscr2ns_scale(unsigned long oscr_rate)
-+{
-+	unsigned long long v = 1000000000ULL << OSCR2NS_SCALE_FACTOR;
-+	do_div(v, oscr_rate);
-+	oscr2ns_scale = v;
-+	/*
-+	 * We want an even value to automatically clear the top bit
-+	 * returned by cnt32_to_63() without an additional run time
-+	 * instruction. So if the LSB is 1 then round it up.
-+	 */
-+	if (oscr2ns_scale & 1)
-+		oscr2ns_scale++;
-+}
-+
-+unsigned long long sched_clock(void)
-+{
-+	unsigned long long v = cnt32_to_63(OSCR);
-+	return (v * oscr2ns_scale) >> OSCR2NS_SCALE_FACTOR;
-+}
-+
- 
- static irqreturn_t
- pxa_ost0_interrupt(int irq, void *dev_id)
-@@ -149,18 +187,29 @@
- 
- static void __init pxa_timer_init(void)
- {
-+	unsigned long clock_tick_rate;
-+
- 	OIER = 0;
- 	OSSR = OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3;
- 
-+	if (cpu_is_pxa21x() || cpu_is_pxa25x())
-+		clock_tick_rate = 3686400;
-+	else if (machine_is_mainstone())
-+		clock_tick_rate = 3249600;
-+	else
-+		clock_tick_rate = 3250000;
-+
-+	set_oscr2ns_scale(clock_tick_rate);
-+
- 	ckevt_pxa_osmr0.mult =
--		div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC, ckevt_pxa_osmr0.shift);
-+		div_sc(clock_tick_rate, NSEC_PER_SEC, ckevt_pxa_osmr0.shift);
- 	ckevt_pxa_osmr0.max_delta_ns =
- 		clockevent_delta2ns(0x7fffffff, &ckevt_pxa_osmr0);
- 	ckevt_pxa_osmr0.min_delta_ns =
- 		clockevent_delta2ns(MIN_OSCR_DELTA, &ckevt_pxa_osmr0) + 1;
- 
- 	cksrc_pxa_oscr0.mult =
--		clocksource_hz2mult(CLOCK_TICK_RATE, cksrc_pxa_oscr0.shift);
-+		clocksource_hz2mult(clock_tick_rate, cksrc_pxa_oscr0.shift);
- 
- 	setup_irq(IRQ_OST0, &pxa_ost0_irq);
- 
---- /dev/null
-+++ linux-2.6.23/arch/arm/mach-pxa/zylonite.c
-@@ -0,0 +1,184 @@
-+/*
-+ * linux/arch/arm/mach-pxa/zylonite.c
-+ *
-+ * Support for the PXA3xx Development Platform (aka Zylonite)
-+ *
-+ * Copyright (C) 2006 Marvell International Ltd.
-+ *
-+ * 2007-09-04: eric miao <eric.y.miao@gmail.com>
-+ *             rewrite to align with latest kernel
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/interrupt.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <asm/hardware.h>
-+#include <asm/arch/gpio.h>
-+#include <asm/arch/pxafb.h>
-+#include <asm/arch/zylonite.h>
-+
-+#include "generic.h"
-+
-+int gpio_backlight;
-+int gpio_eth_irq;
-+
-+int lcd_id;
-+int lcd_orientation;
-+
-+static struct resource smc91x_resources[] = {
-+	[0] = {
-+		.start	= ZYLONITE_ETH_PHYS + 0x300,
-+		.end	= ZYLONITE_ETH_PHYS + 0xfffff,
-+		.flags	= IORESOURCE_MEM,
-+	},
-+	[1] = {
-+		.start	= -1,	/* for run-time assignment */
-+		.end	= -1,
-+		.flags	= IORESOURCE_IRQ,
-+	}
-+};
-+
-+static struct platform_device smc91x_device = {
-+	.name		= "smc91x",
-+	.id		= 0,
-+	.num_resources	= ARRAY_SIZE(smc91x_resources),
-+	.resource	= smc91x_resources,
-+};
-+
-+#if defined(CONFIG_FB_PXA) || (CONFIG_FB_PXA_MODULES)
-+static void zylonite_backlight_power(int on)
-+{
-+	gpio_set_value(gpio_backlight, on);
-+}
-+
-+static struct pxafb_mode_info toshiba_ltm035a776c_mode = {
-+	.pixclock		= 110000,
-+	.xres			= 240,
-+	.yres			= 320,
-+	.bpp			= 16,
-+	.hsync_len		= 4,
-+	.left_margin		= 6,
-+	.right_margin		= 4,
-+	.vsync_len		= 2,
-+	.upper_margin		= 2,
-+	.lower_margin		= 3,
-+	.sync			= FB_SYNC_VERT_HIGH_ACT,
-+};
-+
-+static struct pxafb_mode_info toshiba_ltm04c380k_mode = {
-+	.pixclock		= 50000,
-+	.xres			= 640,
-+	.yres			= 480,
-+	.bpp			= 16,
-+	.hsync_len		= 1,
-+	.left_margin		= 0x9f,
-+	.right_margin		= 1,
-+	.vsync_len		= 44,
-+	.upper_margin		= 0,
-+	.lower_margin		= 0,
-+	.sync			= FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT,
-+};
-+
-+static struct pxafb_mach_info zylonite_toshiba_lcd_info = {
-+	.num_modes      	= 1,
-+	.lccr0			= LCCR0_Act,
-+	.lccr3			= LCCR3_PCP,
-+	.pxafb_backlight_power	= zylonite_backlight_power,
-+};
-+
-+static struct pxafb_mode_info sharp_ls037_modes[] = {
-+	[0] = {
-+		.pixclock	= 158000,
-+		.xres		= 240,
-+		.yres		= 320,
-+		.bpp		= 16,
-+		.hsync_len	= 4,
-+		.left_margin	= 39,
-+		.right_margin	= 39,
-+		.vsync_len	= 1,
-+		.upper_margin	= 2,
-+		.lower_margin	= 3,
-+		.sync		= 0,
-+	},
-+	[1] = {
-+		.pixclock	= 39700,
-+		.xres		= 480,
-+		.yres		= 640,
-+		.bpp		= 16,
-+		.hsync_len	= 8,
-+		.left_margin	= 81,
-+		.right_margin	= 81,
-+		.vsync_len	= 1,
-+		.upper_margin	= 2,
-+		.lower_margin	= 7,
-+		.sync		= 0,
-+	},
-+};
-+
-+static struct pxafb_mach_info zylonite_sharp_lcd_info = {
-+	.modes			= sharp_ls037_modes,
-+	.num_modes		= 2,
-+	.lccr0			= LCCR0_Act,
-+	.lccr3			= LCCR3_PCP | LCCR3_HSP | LCCR3_VSP,
-+	.pxafb_backlight_power	= zylonite_backlight_power,
-+};
-+
-+static void __init zylonite_init_lcd(void)
-+{
-+	/* backlight GPIO: output, default on */
-+	gpio_direction_output(gpio_backlight, 1);
-+
-+	if (lcd_id & 0x20) {
-+		set_pxa_fb_info(&zylonite_sharp_lcd_info);
-+		return;
-+	}
-+
-+	/* legacy LCD panels, it would be handy here if LCD panel type can
-+	 * be decided at run-time
-+	 */
-+	if (1)
-+		zylonite_toshiba_lcd_info.modes = &toshiba_ltm035a776c_mode;
-+	else
-+		zylonite_toshiba_lcd_info.modes = &toshiba_ltm04c380k_mode;
-+
-+	set_pxa_fb_info(&zylonite_toshiba_lcd_info);
-+}
-+#else
-+static inline void zylonite_init_lcd(void) {}
-+#endif
-+
-+static void __init zylonite_init(void)
-+{
-+	/* board-processor specific initialization */
-+	zylonite_pxa300_init();
-+	zylonite_pxa320_init();
-+
-+	/*
-+	 * Note: We depend that the bootloader set
-+	 * the correct value to MSC register for SMC91x.
-+	 */
-+	smc91x_resources[1].start = gpio_to_irq(gpio_eth_irq);
-+	smc91x_resources[1].end   = gpio_to_irq(gpio_eth_irq);
-+	platform_device_register(&smc91x_device);
-+
-+	zylonite_init_lcd();
-+}
-+
-+MACHINE_START(ZYLONITE, "PXA3xx Platform Development Kit (aka Zylonite)")
-+	.phys_io	= 0x40000000,
-+	.boot_params	= 0xa0000100,
-+	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,
-+	.map_io		= pxa_map_io,
-+	.init_irq	= pxa3xx_init_irq,
-+	.timer		= &pxa_timer,
-+	.init_machine	= zylonite_init,
-+MACHINE_END
---- /dev/null
-+++ linux-2.6.23/arch/arm/mach-pxa/zylonite_pxa300.c
-@@ -0,0 +1,188 @@
-+/*
-+ * linux/arch/arm/mach-pxa/zylonite_pxa300.c
-+ *
-+ * PXA300/PXA310 specific support code for the
-+ * PXA3xx Development Platform (aka Zylonite)
-+ *
-+ * Copyright (C) 2007 Marvell Internation Ltd.
-+ * 2007-08-21: eric miao <eric.y.miao@gmail.com>
-+ *             initial version
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+
-+#include <asm/gpio.h>
-+#include <asm/arch/mfp-pxa300.h>
-+#include <asm/arch/zylonite.h>
-+
-+#define ARRAY_AND_SIZE(x)	(x), ARRAY_SIZE(x)
-+
-+/* PXA300/PXA310 common configurations */
-+static mfp_cfg_t common_mfp_cfg[] __initdata = {
-+	/* LCD */
-+	GPIO54_LCD_LDD_0,
-+	GPIO55_LCD_LDD_1,
-+	GPIO56_LCD_LDD_2,
-+	GPIO57_LCD_LDD_3,
-+	GPIO58_LCD_LDD_4,
-+	GPIO59_LCD_LDD_5,
-+	GPIO60_LCD_LDD_6,
-+	GPIO61_LCD_LDD_7,
-+	GPIO62_LCD_LDD_8,
-+	GPIO63_LCD_LDD_9,
-+	GPIO64_LCD_LDD_10,
-+	GPIO65_LCD_LDD_11,
-+	GPIO66_LCD_LDD_12,
-+	GPIO67_LCD_LDD_13,
-+	GPIO68_LCD_LDD_14,
-+	GPIO69_LCD_LDD_15,
-+	GPIO70_LCD_LDD_16,
-+	GPIO71_LCD_LDD_17,
-+	GPIO72_LCD_FCLK,
-+	GPIO73_LCD_LCLK,
-+	GPIO74_LCD_PCLK,
-+	GPIO75_LCD_BIAS,
-+	GPIO76_LCD_VSYNC,
-+	GPIO127_LCD_CS_N,
-+
-+	/* BTUART */
-+	GPIO111_UART2_RTS,
-+	GPIO112_UART2_RXD,
-+	GPIO113_UART2_TXD,
-+	GPIO114_UART2_CTS,
-+
-+	/* STUART */
-+	GPIO109_UART3_TXD,
-+	GPIO110_UART3_RXD,
-+
-+	/* AC97 */
-+	GPIO23_AC97_nACRESET,
-+	GPIO24_AC97_SYSCLK,
-+	GPIO29_AC97_BITCLK,
-+	GPIO25_AC97_SDATA_IN_0,
-+	GPIO27_AC97_SDATA_OUT,
-+	GPIO28_AC97_SYNC,
-+
-+	/* Keypad */
-+	GPIO107_KP_DKIN_0,
-+	GPIO108_KP_DKIN_1,
-+	GPIO115_KP_MKIN_0,
-+	GPIO116_KP_MKIN_1,
-+	GPIO117_KP_MKIN_2,
-+	GPIO118_KP_MKIN_3,
-+	GPIO119_KP_MKIN_4,
-+	GPIO120_KP_MKIN_5,
-+	GPIO2_2_KP_MKIN_6,
-+	GPIO3_2_KP_MKIN_7,
-+	GPIO121_KP_MKOUT_0,
-+	GPIO122_KP_MKOUT_1,
-+	GPIO123_KP_MKOUT_2,
-+	GPIO124_KP_MKOUT_3,
-+	GPIO125_KP_MKOUT_4,
-+	GPIO4_2_KP_MKOUT_5,
-+	GPIO5_2_KP_MKOUT_6,
-+	GPIO6_2_KP_MKOUT_7,
-+};
-+
-+static mfp_cfg_t pxa300_mfp_cfg[] __initdata = {
-+	/* FFUART */
-+	GPIO30_UART1_RXD,
-+	GPIO31_UART1_TXD,
-+	GPIO32_UART1_CTS,
-+	GPIO37_UART1_RTS,
-+	GPIO33_UART1_DCD,
-+	GPIO34_UART1_DSR,
-+	GPIO35_UART1_RI,
-+	GPIO36_UART1_DTR,
-+
-+	/* Ethernet */
-+	GPIO2_nCS3,
-+	GPIO99_GPIO,
-+};
-+
-+static mfp_cfg_t pxa310_mfp_cfg[] __initdata = {
-+	/* FFUART */
-+	GPIO99_UART1_RXD,
-+	GPIO100_UART1_TXD,
-+	GPIO101_UART1_CTS,
-+	GPIO106_UART1_RTS,
-+
-+	/* Ethernet */
-+	GPIO2_nCS3,
-+	GPIO102_GPIO,
-+};
-+
-+#define NUM_LCD_DETECT_PINS	7
-+
-+static int lcd_detect_pins[] __initdata = {
-+	MFP_PIN_GPIO71,	/* LCD_LDD_17 - ORIENT */
-+	MFP_PIN_GPIO70, /* LCD_LDD_16 - LCDID[5] */
-+	MFP_PIN_GPIO75, /* LCD_BIAS   - LCDID[4] */
-+	MFP_PIN_GPIO73, /* LCD_LCLK   - LCDID[3] */
-+	MFP_PIN_GPIO72, /* LCD_FCLK   - LCDID[2] */
-+	MFP_PIN_GPIO127,/* LCD_CS_N   - LCDID[1] */
-+	MFP_PIN_GPIO76, /* LCD_VSYNC  - LCDID[0] */
-+};
-+
-+static void __init zylonite_detect_lcd_panel(void)
-+{
-+	unsigned long mfpr_save[NUM_LCD_DETECT_PINS];
-+	int i, gpio, id = 0;
-+
-+	/* save the original MFP settings of these pins and configure
-+	 * them as GPIO Input, DS01X, Pull Neither, Edge Clear
-+	 */
-+	for (i = 0; i < NUM_LCD_DETECT_PINS; i++) {
-+		mfpr_save[i] = pxa3xx_mfp_read(lcd_detect_pins[i]);
-+		pxa3xx_mfp_write(lcd_detect_pins[i], 0x8440);
-+	}
-+
-+	for (i = 0; i < NUM_LCD_DETECT_PINS; i++) {
-+		id = id << 1;
-+		gpio = mfp_to_gpio(lcd_detect_pins[i]);
-+		gpio_direction_input(gpio);
-+
-+		if (gpio_get_value(gpio))
-+			id = id | 0x1;
-+	}
-+
-+	/* lcd id, flush out bit 1 */
-+	lcd_id = id & 0x3d;
-+
-+	/* lcd orientation, portrait or landscape */
-+	lcd_orientation = (id >> 6) & 0x1;
-+
-+	/* restore the original MFP settings */
-+	for (i = 0; i < NUM_LCD_DETECT_PINS; i++)
-+		pxa3xx_mfp_write(lcd_detect_pins[i], mfpr_save[i]);
-+}
-+
-+void __init zylonite_pxa300_init(void)
-+{
-+	if (cpu_is_pxa300() || cpu_is_pxa310()) {
-+		/* initialize MFP */
-+		pxa3xx_mfp_config(ARRAY_AND_SIZE(common_mfp_cfg));
-+
-+		/* detect LCD panel */
-+		zylonite_detect_lcd_panel();
-+
-+		/* GPIO pin assignment */
-+		gpio_backlight = mfp_to_gpio(MFP_PIN_GPIO20);
-+	}
-+
-+	if (cpu_is_pxa300()) {
-+		pxa3xx_mfp_config(ARRAY_AND_SIZE(pxa300_mfp_cfg));
-+		gpio_eth_irq = mfp_to_gpio(MFP_PIN_GPIO99);
-+	}
-+
-+	if (cpu_is_pxa310()) {
-+		pxa3xx_mfp_config(ARRAY_AND_SIZE(pxa310_mfp_cfg));
-+		gpio_eth_irq = mfp_to_gpio(MFP_PIN_GPIO102);
-+	}
-+}
---- /dev/null
-+++ linux-2.6.23/arch/arm/mach-pxa/zylonite_pxa320.c
-@@ -0,0 +1,173 @@
-+/*
-+ * linux/arch/arm/mach-pxa/zylonite_pxa320.c
-+ *
-+ * PXA320 specific support code for the
-+ * PXA3xx Development Platform (aka Zylonite)
-+ *
-+ * Copyright (C) 2007 Marvell Internation Ltd.
-+ * 2007-08-21: eric miao <eric.y.miao@gmail.com>
-+ *             initial version
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+
-+#include <asm/arch/gpio.h>
-+#include <asm/arch/mfp-pxa320.h>
-+#include <asm/arch/zylonite.h>
-+
-+#define ARRAY_AND_SIZE(x)	(x), ARRAY_SIZE(x)
-+
-+static mfp_cfg_t mfp_cfg[] __initdata = {
-+	/* LCD */
-+	GPIO6_2_LCD_LDD_0,
-+	GPIO7_2_LCD_LDD_1,
-+	GPIO8_2_LCD_LDD_2,
-+	GPIO9_2_LCD_LDD_3,
-+	GPIO10_2_LCD_LDD_4,
-+	GPIO11_2_LCD_LDD_5,
-+	GPIO12_2_LCD_LDD_6,
-+	GPIO13_2_LCD_LDD_7,
-+	GPIO63_LCD_LDD_8,
-+	GPIO64_LCD_LDD_9,
-+	GPIO65_LCD_LDD_10,
-+	GPIO66_LCD_LDD_11,
-+	GPIO67_LCD_LDD_12,
-+	GPIO68_LCD_LDD_13,
-+	GPIO69_LCD_LDD_14,
-+	GPIO70_LCD_LDD_15,
-+	GPIO71_LCD_LDD_16,
-+	GPIO72_LCD_LDD_17,
-+	GPIO73_LCD_CS_N,
-+	GPIO74_LCD_VSYNC,
-+	GPIO14_2_LCD_FCLK,
-+	GPIO15_2_LCD_LCLK,
-+	GPIO16_2_LCD_PCLK,
-+	GPIO17_2_LCD_BIAS,
-+
-+	/* FFUART */
-+	GPIO41_UART1_RXD,
-+	GPIO42_UART1_TXD,
-+	GPIO43_UART1_CTS,
-+	GPIO44_UART1_DCD,
-+	GPIO45_UART1_DSR,
-+	GPIO46_UART1_RI,
-+	GPIO47_UART1_DTR,
-+	GPIO48_UART1_RTS,
-+
-+	/* AC97 */
-+	GPIO34_AC97_SYSCLK,
-+	GPIO35_AC97_SDATA_IN_0,
-+	GPIO37_AC97_SDATA_OUT,
-+	GPIO38_AC97_SYNC,
-+	GPIO39_AC97_BITCLK,
-+	GPIO40_AC97_nACRESET,
-+
-+	/* I2C */
-+	GPIO32_I2C_SCL,
-+	GPIO33_I2C_SDA,
-+
-+	/* Keypad */
-+	GPIO105_KP_DKIN_0,
-+	GPIO106_KP_DKIN_1,
-+	GPIO113_KP_MKIN_0,
-+	GPIO114_KP_MKIN_1,
-+	GPIO115_KP_MKIN_2,
-+	GPIO116_KP_MKIN_3,
-+	GPIO117_KP_MKIN_4,
-+	GPIO118_KP_MKIN_5,
-+	GPIO119_KP_MKIN_6,
-+	GPIO120_KP_MKIN_7,
-+	GPIO121_KP_MKOUT_0,
-+	GPIO122_KP_MKOUT_1,
-+	GPIO123_KP_MKOUT_2,
-+	GPIO124_KP_MKOUT_3,
-+	GPIO125_KP_MKOUT_4,
-+	GPIO126_KP_MKOUT_5,
-+	GPIO127_KP_MKOUT_6,
-+	GPIO5_2_KP_MKOUT_7,
-+
-+	/* Ethernet */
-+	GPIO4_nCS3,
-+	GPIO90_GPIO,
-+};
-+
-+#define NUM_LCD_DETECT_PINS	7
-+
-+static int lcd_detect_pins[] __initdata = {
-+	MFP_PIN_GPIO72,   /* LCD_LDD_17 - ORIENT */
-+	MFP_PIN_GPIO71,   /* LCD_LDD_16 - LCDID[5] */
-+	MFP_PIN_GPIO17_2, /* LCD_BIAS   - LCDID[4] */
-+	MFP_PIN_GPIO15_2, /* LCD_LCLK   - LCDID[3] */
-+	MFP_PIN_GPIO14_2, /* LCD_FCLK   - LCDID[2] */
-+	MFP_PIN_GPIO73,   /* LCD_CS_N   - LCDID[1] */
-+	MFP_PIN_GPIO74,   /* LCD_VSYNC  - LCDID[0] */
-+	/*
-+	 * set the MFP_PIN_GPIO 14/15/17 to alternate function other than
-+	 * GPIO to avoid input level confliction with 14_2, 15_2, 17_2
-+	 */
-+	MFP_PIN_GPIO14,
-+	MFP_PIN_GPIO15,
-+	MFP_PIN_GPIO17,
-+};
-+
-+static int lcd_detect_mfpr[] __initdata = {
-+	/* AF0, DS 1X, Pull Neither, Edge Clear */
-+	0x8440, 0x8440, 0x8440, 0x8440, 0x8440, 0x8440, 0x8440,
-+	0xc442, /* Backlight, Pull-Up, AF2 */
-+	0x8445, /* AF5 */
-+	0x8445, /* AF5 */
-+};
-+
-+static void __init zylonite_detect_lcd_panel(void)
-+{
-+	unsigned long mfpr_save[ARRAY_SIZE(lcd_detect_pins)];
-+	int i, gpio, id = 0;
-+
-+	/* save the original MFP settings of these pins and configure them
-+	 * as GPIO Input, DS01X, Pull Neither, Edge Clear
-+	 */
-+	for (i = 0; i < ARRAY_SIZE(lcd_detect_pins); i++) {
-+		mfpr_save[i] = pxa3xx_mfp_read(lcd_detect_pins[i]);
-+		pxa3xx_mfp_write(lcd_detect_pins[i], lcd_detect_mfpr[i]);
-+	}
-+
-+	for (i = 0; i < NUM_LCD_DETECT_PINS; i++) {
-+		id = id << 1;
-+		gpio = mfp_to_gpio(lcd_detect_pins[i]);
-+		gpio_direction_input(gpio);
-+
-+		if (gpio_get_value(gpio))
-+			id = id | 0x1;
-+	}
-+
-+	/* lcd id, flush out bit 1 */
-+	lcd_id = id & 0x3d;
-+
-+	/* lcd orientation, portrait or landscape */
-+	lcd_orientation = (id >> 6) & 0x1;
-+
-+	/* restore the original MFP settings */
-+	for (i = 0; i < ARRAY_SIZE(lcd_detect_pins); i++)
-+		pxa3xx_mfp_write(lcd_detect_pins[i], mfpr_save[i]);
-+}
-+
-+void __init zylonite_pxa320_init(void)
-+{
-+	if (cpu_is_pxa320()) {
-+		/* initialize MFP */
-+		pxa3xx_mfp_config(ARRAY_AND_SIZE(mfp_cfg));
-+
-+		/* detect LCD panel */
-+		zylonite_detect_lcd_panel();
-+
-+		/* GPIO pin assignment */
-+		gpio_backlight	= mfp_to_gpio(MFP_PIN_GPIO14);
-+		gpio_eth_irq	= mfp_to_gpio(MFP_PIN_GPIO9);
-+	}
-+}
---- linux-2.6.23.orig/arch/arm/mm/Kconfig
-+++ linux-2.6.23/arch/arm/mm/Kconfig
-@@ -322,7 +322,7 @@
- # XScale
- config CPU_XSCALE
- 	bool
--	depends on ARCH_IOP32X || ARCH_IOP33X || ARCH_PXA || ARCH_IXP4XX || ARCH_IXP2000
-+	depends on ARCH_IOP32X || ARCH_IOP33X || PXA25x || PXA27x || ARCH_IXP4XX || ARCH_IXP2000
- 	default y
- 	select CPU_32v5
- 	select CPU_ABRT_EV5T
-@@ -333,7 +333,7 @@
- # XScale Core Version 3
- config CPU_XSC3
- 	bool
--	depends on ARCH_IXP23XX || ARCH_IOP13XX
-+	depends on ARCH_IXP23XX || ARCH_IOP13XX || PXA3xx
- 	default y
- 	select CPU_32v5
- 	select CPU_ABRT_EV5T
---- linux-2.6.23.orig/drivers/i2c/busses/i2c-pxa.c
-+++ linux-2.6.23/drivers/i2c/busses/i2c-pxa.c
-@@ -31,6 +31,8 @@
- #include <linux/interrupt.h>
- #include <linux/i2c-pxa.h>
- #include <linux/platform_device.h>
-+#include <linux/err.h>
-+#include <linux/clk.h>
- 
- #include <asm/hardware.h>
- #include <asm/irq.h>
-@@ -48,6 +50,7 @@
- 	unsigned int		slave_addr;
- 
- 	struct i2c_adapter	adap;
-+	struct clk		*clk;
- #ifdef CONFIG_I2C_PXA_SLAVE
- 	struct i2c_slave_client *slave;
- #endif
-@@ -869,6 +872,12 @@
- 
- 	sprintf(i2c->adap.name, "pxa_i2c-i2c.%u", dev->id);
- 
-+	i2c->clk = clk_get(&dev->dev, "I2CCLK");
-+	if (IS_ERR(i2c->clk)) {
-+		ret = PTR_ERR(i2c->clk);
-+		goto eclk;
-+	}
-+
- 	i2c->reg_base = ioremap(res->start, res_len(res));
- 	if (!i2c->reg_base) {
- 		ret = -EIO;
-@@ -889,22 +898,19 @@
- 	}
- #endif
- 
-+	clk_enable(i2c->clk);
-+#ifdef CONFIG_PXA27x
- 	switch (dev->id) {
- 	case 0:
--#ifdef CONFIG_PXA27x
- 		pxa_gpio_mode(GPIO117_I2CSCL_MD);
- 		pxa_gpio_mode(GPIO118_I2CSDA_MD);
--#endif
--		pxa_set_cken(CKEN_I2C, 1);
- 		break;
--#ifdef CONFIG_PXA27x
- 	case 1:
- 		local_irq_disable();
- 		PCFR |= PCFR_PI2CEN;
- 		local_irq_enable();
--		pxa_set_cken(CKEN_PWRI2C, 1);
--#endif
- 	}
-+#endif
- 
- 	ret = request_irq(irq, i2c_pxa_handler, IRQF_DISABLED,
- 			  i2c->adap.name, i2c);
-@@ -948,19 +954,18 @@
- eadapt:
- 	free_irq(irq, i2c);
- ereqirq:
--	switch (dev->id) {
--	case 0:
--		pxa_set_cken(CKEN_I2C, 0);
--		break;
-+	clk_disable(i2c->clk);
-+
- #ifdef CONFIG_PXA27x
--	case 1:
--		pxa_set_cken(CKEN_PWRI2C, 0);
-+	if (dev->id == 1) {
- 		local_irq_disable();
- 		PCFR &= ~PCFR_PI2CEN;
- 		local_irq_enable();
--#endif
- 	}
-+#endif
- eremap:
-+	clk_put(i2c->clk);
-+eclk:
- 	kfree(i2c);
- emalloc:
- 	release_mem_region(res->start, res_len(res));
-@@ -975,18 +980,18 @@
- 
- 	i2c_del_adapter(&i2c->adap);
- 	free_irq(i2c->irq, i2c);
--	switch (dev->id) {
--	case 0:
--		pxa_set_cken(CKEN_I2C, 0);
--		break;
-+
-+	clk_disable(i2c->clk);
-+	clk_put(i2c->clk);
-+
- #ifdef CONFIG_PXA27x
--	case 1:
--		pxa_set_cken(CKEN_PWRI2C, 0);
-+	if (dev->id == 1) {
- 		local_irq_disable();
- 		PCFR &= ~PCFR_PI2CEN;
- 		local_irq_enable();
--#endif
- 	}
-+#endif
-+
- 	release_mem_region(i2c->iobase, i2c->iosize);
- 	kfree(i2c);
- 
---- linux-2.6.23.orig/drivers/input/keyboard/pxa27x_keyboard.c
-+++ linux-2.6.23/drivers/input/keyboard/pxa27x_keyboard.c
-@@ -23,6 +23,8 @@
- #include <linux/input.h>
- #include <linux/device.h>
- #include <linux/platform_device.h>
-+#include <linux/clk.h>
-+#include <linux/err.h>
- 
- #include <asm/mach-types.h>
- #include <asm/mach/arch.h>
-@@ -40,6 +42,8 @@
- 				 col/2 == 2 ? KPASMKP2 : KPASMKP3)
- #define KPASMKPx_MKC(row, col)	(1 << (row + 16 * (col % 2)))
- 
-+static struct clk *pxakbd_clk;
-+
- static irqreturn_t pxakbd_irq_handler(int irq, void *dev_id)
- {
- 	struct platform_device *pdev = dev_id;
-@@ -104,7 +108,7 @@
- 	KPREC = 0x7F;
- 
- 	/* Enable unit clock */
--	pxa_set_cken(CKEN_KEYPAD, 1);
-+	clk_enable(pxakbd_clk);
- 
- 	return 0;
- }
-@@ -112,7 +116,7 @@
- static void pxakbd_close(struct input_dev *dev)
- {
- 	/* Disable clock unit */
--	pxa_set_cken(CKEN_KEYPAD, 0);
-+	clk_disable(pxakbd_clk);
- }
- 
- #ifdef CONFIG_PM
-@@ -140,7 +144,8 @@
- 		KPREC = pdata->reg_kprec;
- 
- 		/* Enable unit clock */
--		pxa_set_cken(CKEN_KEYPAD, 1);
-+		clk_disable(pxakbd_clk);
-+		clk_enable(pxakbd_clk);
- 	}
- 
- 	mutex_unlock(&input_dev->mutex);
-@@ -158,11 +163,18 @@
- 	struct input_dev *input_dev;
- 	int i, row, col, error;
- 
-+	pxakbd_clk = clk_get(&pdev->dev, "KBDCLK");
-+	if (IS_ERR(pxakbd_clk)) {
-+		error = PTR_ERR(pxakbd_clk);
-+		goto err_clk;
-+	}
-+
- 	/* Create and register the input driver. */
- 	input_dev = input_allocate_device();
- 	if (!input_dev) {
- 		printk(KERN_ERR "Cannot request keypad device\n");
--		return -ENOMEM;
-+		error = -ENOMEM;
-+		goto err_alloc;
- 	}
- 
- 	input_dev->name = DRIVER_NAME;
-@@ -185,7 +197,6 @@
- 			    DRIVER_NAME, pdev);
- 	if (error) {
- 		printk(KERN_ERR "Cannot request keypad IRQ\n");
--		pxa_set_cken(CKEN_KEYPAD, 0);
- 		goto err_free_dev;
- 	}
- 
-@@ -217,6 +228,9 @@
- 	free_irq(IRQ_KEYPAD, pdev);
-  err_free_dev:
- 	input_free_device(input_dev);
-+ err_alloc:
-+	clk_put(pxakbd_clk);
-+ err_clk:
- 	return error;
- }
- 
-@@ -226,6 +240,7 @@
- 
- 	input_unregister_device(input_dev);
- 	free_irq(IRQ_KEYPAD, pdev);
-+	clk_put(pxakbd_clk);
- 	platform_set_drvdata(pdev, NULL);
- 
- 	return 0;
---- linux-2.6.23.orig/drivers/mmc/host/pxamci.c
-+++ linux-2.6.23/drivers/mmc/host/pxamci.c
-@@ -23,6 +23,8 @@
- #include <linux/delay.h>
- #include <linux/interrupt.h>
- #include <linux/dma-mapping.h>
-+#include <linux/clk.h>
-+#include <linux/err.h>
- #include <linux/mmc/host.h>
- 
- #include <asm/dma.h>
-@@ -44,6 +46,8 @@
- 	spinlock_t		lock;
- 	struct resource		*res;
- 	void __iomem		*base;
-+	struct clk		*clk;
-+	unsigned long		clkrate;
- 	int			irq;
- 	int			dma;
- 	unsigned int		clkrt;
-@@ -119,7 +123,7 @@
- 	writel(nob, host->base + MMC_NOB);
- 	writel(data->blksz, host->base + MMC_BLKLEN);
- 
--	clks = (unsigned long long)data->timeout_ns * CLOCKRATE;
-+	clks = (unsigned long long)data->timeout_ns * host->clkrate;
- 	do_div(clks, 1000000000UL);
- 	timeout = (unsigned int)clks + (data->timeout_clks << host->clkrt);
- 	writel((timeout + 255) / 256, host->base + MMC_RDTO);
-@@ -358,18 +362,25 @@
- 	struct pxamci_host *host = mmc_priv(mmc);
- 
- 	if (ios->clock) {
--		unsigned int clk = CLOCKRATE / ios->clock;
--		if (CLOCKRATE / clk > ios->clock)
-+		unsigned long rate = host->clkrate;
-+		unsigned int clk = rate / ios->clock;
-+
-+		/*
-+		 * clk might result in a lower divisor than we
-+		 * desire.  check for that condition and adjust
-+		 * as appropriate.
-+		 */
-+		if (rate / clk > ios->clock)
- 			clk <<= 1;
- 		host->clkrt = fls(clk) - 1;
--		pxa_set_cken(CKEN_MMC, 1);
-+		clk_enable(host->clk);
- 
- 		/*
- 		 * we write clkrt on the next command
- 		 */
- 	} else {
- 		pxamci_stop_clock(host);
--		pxa_set_cken(CKEN_MMC, 0);
-+		clk_disable(host->clk);
- 	}
- 
- 	if (host->power_mode != ios->power_mode) {
-@@ -429,8 +440,6 @@
- 	}
- 
- 	mmc->ops = &pxamci_ops;
--	mmc->f_min = CLOCKRATE_MIN;
--	mmc->f_max = CLOCKRATE_MAX;
- 
- 	/*
- 	 * We can do SG-DMA, but we don't because we never know how much
-@@ -457,6 +466,22 @@
- 	host->mmc = mmc;
- 	host->dma = -1;
- 	host->pdata = pdev->dev.platform_data;
-+
-+	host->clk = clk_get(&pdev->dev, "MMCCLK");
-+	if (IS_ERR(host->clk)) {
-+		ret = PTR_ERR(host->clk);
-+		host->clk = NULL;
-+		goto out;
-+	}
-+
-+	host->clkrate = clk_get_rate(host->clk);
-+
-+	/*
-+	 * Calculate minimum clock rate, rounding up.
-+	 */
-+	mmc->f_min = (host->clkrate + 63) / 64;
-+	mmc->f_max = host->clkrate;
-+
- 	mmc->ocr_avail = host->pdata ?
- 			 host->pdata->ocr_mask :
- 			 MMC_VDD_32_33|MMC_VDD_33_34;
-@@ -515,6 +540,8 @@
- 			iounmap(host->base);
- 		if (host->sg_cpu)
- 			dma_free_coherent(&pdev->dev, PAGE_SIZE, host->sg_cpu, host->sg_dma);
-+		if (host->clk)
-+			clk_put(host->clk);
- 	}
- 	if (mmc)
- 		mmc_free_host(mmc);
-@@ -549,6 +576,8 @@
- 		iounmap(host->base);
- 		dma_free_coherent(&pdev->dev, PAGE_SIZE, host->sg_cpu, host->sg_dma);
- 
-+		clk_put(host->clk);
-+
- 		release_resource(host->res);
- 
- 		mmc_free_host(mmc);
---- linux-2.6.23.orig/drivers/mmc/host/pxamci.h
-+++ linux-2.6.23/drivers/mmc/host/pxamci.h
-@@ -86,17 +86,3 @@
- #define MMC_RXFIFO	0x0040	/* 8 bit */
- 
- #define MMC_TXFIFO	0x0044	/* 8 bit */
--
--/*
-- * The base MMC clock rate
-- */
--#ifdef CONFIG_PXA27x
--#define CLOCKRATE_MIN	304688
--#define CLOCKRATE_MAX	19500000
--#else
--#define CLOCKRATE_MIN	312500
--#define CLOCKRATE_MAX	20000000
--#endif
--
--#define CLOCKRATE	CLOCKRATE_MAX
--
---- linux-2.6.23.orig/drivers/mtd/maps/lubbock-flash.c
-+++ linux-2.6.23/drivers/mtd/maps/lubbock-flash.c
-@@ -22,6 +22,7 @@
- 
- #include <asm/io.h>
- #include <asm/hardware.h>
-+#include <asm/mach-types.h>
- #include <asm/arch/pxa-regs.h>
- #include <asm/arch/lubbock.h>
- #include <asm/cacheflush.h>
-@@ -71,9 +72,14 @@
- 
- static int __init init_lubbock(void)
- {
--	int flashboot = (LUB_CONF_SWITCHES & 1);
-+	int flashboot;
- 	int ret = 0, i;
- 
-+	if (!machine_is_lubbock())
-+		return -ENODEV;
-+
-+	flashboot = (LUB_CONF_SWITCHES & 1);
-+
- 	lubbock_maps[0].bankwidth = lubbock_maps[1].bankwidth =
- 		(BOOT_DEF & 1) ? 2 : 4;
- 
---- linux-2.6.23.orig/drivers/mtd/maps/mainstone-flash.c
-+++ linux-2.6.23/drivers/mtd/maps/mainstone-flash.c
-@@ -22,6 +22,7 @@
- 
- #include <asm/io.h>
- #include <asm/hardware.h>
-+#include <asm/mach-types.h>
- #include <asm/arch/pxa-regs.h>
- #include <asm/arch/mainstone.h>
- #include <asm/cacheflush.h>
-@@ -76,6 +77,9 @@
- 	int SW7 = 0;  /* FIXME: get from SCR (Mst doc section 3.2.1.1) */
- 	int ret = 0, i;
- 
-+	if (!machine_is_mainstone())
-+		return -ENODEV;
-+
- 	mainstone_maps[0].bankwidth = (BOOT_DEF & 1) ? 2 : 4;
- 	mainstone_maps[1].bankwidth = 4;
- 
---- linux-2.6.23.orig/drivers/net/irda/pxaficp_ir.c
-+++ linux-2.6.23/drivers/net/irda/pxaficp_ir.c
-@@ -23,6 +23,7 @@
- #include <linux/dma-mapping.h>
- #include <linux/platform_device.h>
- #include <linux/pm.h>
-+#include <linux/clk.h>
- 
- #include <net/irda/irda.h>
- #include <net/irda/irmod.h>
-@@ -87,8 +88,30 @@
- 
- 	struct device		*dev;
- 	struct pxaficp_platform_data *pdata;
-+	struct clk		*fir_clk;
-+	struct clk		*sir_clk;
-+	struct clk		*cur_clk;
- };
- 
-+static inline void pxa_irda_disable_clk(struct pxa_irda *si)
-+{
-+	if (si->cur_clk)
-+		clk_disable(si->cur_clk);
-+	si->cur_clk = NULL;
-+}
-+
-+static inline void pxa_irda_enable_firclk(struct pxa_irda *si)
-+{
-+	si->cur_clk = si->fir_clk;
-+	clk_enable(si->fir_clk);
-+}
-+
-+static inline void pxa_irda_enable_sirclk(struct pxa_irda *si)
-+{
-+	si->cur_clk = si->sir_clk;
-+	clk_enable(si->sir_clk);
-+}
-+
- 
- #define IS_FIR(si)		((si)->speed >= 4000000)
- #define IRDA_FRAME_SIZE_LIMIT	2047
-@@ -134,7 +157,7 @@
- 			DCSR(si->rxdma) &= ~DCSR_RUN;
- 			/* disable FICP */
- 			ICCR0 = 0;
--			pxa_set_cken(CKEN_FICP, 0);
-+			pxa_irda_disable_clk(si);
- 
- 			/* set board transceiver to SIR mode */
- 			si->pdata->transceiver_mode(si->dev, IR_SIRMODE);
-@@ -144,7 +167,7 @@
- 			pxa_gpio_mode(GPIO47_STTXD_MD);
- 
- 			/* enable the STUART clock */
--			pxa_set_cken(CKEN_STUART, 1);
-+			pxa_irda_enable_sirclk(si);
- 		}
- 
- 		/* disable STUART first */
-@@ -169,7 +192,7 @@
- 		/* disable STUART */
- 		STIER = 0;
- 		STISR = 0;
--		pxa_set_cken(CKEN_STUART, 0);
-+		pxa_irda_disable_clk(si);
- 
- 		/* disable FICP first */
- 		ICCR0 = 0;
-@@ -182,7 +205,7 @@
- 		pxa_gpio_mode(GPIO47_ICPTXD_MD);
- 
- 		/* enable the FICP clock */
--		pxa_set_cken(CKEN_FICP, 1);
-+		pxa_irda_enable_firclk(si);
- 
- 		si->speed = speed;
- 		pxa_irda_fir_dma_rx_start(si);
-@@ -592,16 +615,15 @@
- 	STIER = 0;
- 	/* disable STUART SIR mode */
- 	STISR = 0;
--	/* disable the STUART clock */
--	pxa_set_cken(CKEN_STUART, 0);
- 
- 	/* disable DMA */
- 	DCSR(si->txdma) &= ~DCSR_RUN;
- 	DCSR(si->rxdma) &= ~DCSR_RUN;
- 	/* disable FICP */
- 	ICCR0 = 0;
--	/* disable the FICP clock */
--	pxa_set_cken(CKEN_FICP, 0);
-+
-+	/* disable the STUART or FICP clocks */
-+	pxa_irda_disable_clk(si);
- 
- 	DRCMR17 = 0;
- 	DRCMR18 = 0;
-@@ -792,6 +814,13 @@
- 	si->dev = &pdev->dev;
- 	si->pdata = pdev->dev.platform_data;
- 
-+	si->sir_clk = clk_get(&pdev->dev, "UARTCLK");
-+	si->fir_clk = clk_get(&pdev->dev, "FICPCLK");
-+	if (IS_ERR(si->sir_clk) || IS_ERR(si->fir_clk)) {
-+		err = PTR_ERR(IS_ERR(si->sir_clk) ? si->sir_clk : si->fir_clk);
-+		goto err_mem_4;
-+	}
-+
- 	/*
- 	 * Initialise the SIR buffers
- 	 */
-@@ -831,6 +860,10 @@
- err_mem_5:
- 		kfree(si->rx_buff.head);
- err_mem_4:
-+		if (si->sir_clk && !IS_ERR(si->sir_clk))
-+			clk_put(si->sir_clk);
-+		if (si->fir_clk && !IS_ERR(si->fir_clk))
-+			clk_put(si->fir_clk);
- 		free_netdev(dev);
- err_mem_3:
- 		release_mem_region(__PREG(FICP), 0x1c);
-@@ -850,6 +883,8 @@
- 		unregister_netdev(dev);
- 		kfree(si->tx_buff.head);
- 		kfree(si->rx_buff.head);
-+		clk_put(si->fir_clk);
-+		clk_put(si->sir_clk);
- 		free_netdev(dev);
- 	}
- 
---- linux-2.6.23.orig/drivers/net/smc91x.c
-+++ linux-2.6.23/drivers/net/smc91x.c
-@@ -173,56 +173,6 @@
-  */
- #define MII_DELAY		1
- 
--/* store this information for the driver.. */
--struct smc_local {
--	/*
--	 * If I have to wait until memory is available to send a
--	 * packet, I will store the skbuff here, until I get the
--	 * desired memory.  Then, I'll send it out and free it.
--	 */
--	struct sk_buff *pending_tx_skb;
--	struct tasklet_struct tx_task;
--
-- 	/*
--	 * these are things that the kernel wants me to keep, so users
--	 * can find out semi-useless statistics of how well the card is
--	 * performing
--	 */
--	struct net_device_stats stats;
--
--	/* version/revision of the SMC91x chip */
--	int	version;
--
--	/* Contains the current active transmission mode */
--	int	tcr_cur_mode;
--
--	/* Contains the current active receive mode */
--	int	rcr_cur_mode;
--
--	/* Contains the current active receive/phy mode */
--	int	rpc_cur_mode;
--	int	ctl_rfduplx;
--	int	ctl_rspeed;
--
--	u32	msg_enable;
--	u32	phy_type;
--	struct mii_if_info mii;
--
--	/* work queue */
--	struct work_struct phy_configure;
--	struct net_device *dev;
--	int	work_pending;
--
--	spinlock_t lock;
--
--#ifdef SMC_USE_PXA_DMA
--	/* DMA needs the physical address of the chip */
--	u_long physaddr;
--#endif
--	void __iomem *base;
--	void __iomem *datacs;
--};
--
- #if SMC_DEBUG > 0
- #define DBG(n, args...)					\
- 	do {						\
-@@ -2238,17 +2188,19 @@
- 		goto out_release_attrib;
- 	}
- 
--	platform_set_drvdata(pdev, ndev);
--	ret = smc_probe(ndev, addr);
--	if (ret != 0)
--		goto out_iounmap;
- #ifdef SMC_USE_PXA_DMA
--	else {
-+	{
- 		struct smc_local *lp = netdev_priv(ndev);
-+		lp->device = &pdev->dev;
- 		lp->physaddr = res->start;
- 	}
- #endif
- 
-+	platform_set_drvdata(pdev, ndev);
-+	ret = smc_probe(ndev, addr);
-+	if (ret != 0)
-+		goto out_iounmap;
-+
- 	smc_request_datacs(pdev, ndev);
- 
- 	return 0;
---- linux-2.6.23.orig/drivers/net/smc91x.h
-+++ linux-2.6.23/drivers/net/smc91x.h
-@@ -461,6 +461,59 @@
- 
- #endif
- 
-+
-+/* store this information for the driver.. */
-+struct smc_local {
-+	/*
-+	 * If I have to wait until memory is available to send a
-+	 * packet, I will store the skbuff here, until I get the
-+	 * desired memory.  Then, I'll send it out and free it.
-+	 */
-+	struct sk_buff *pending_tx_skb;
-+	struct tasklet_struct tx_task;
-+
-+	/*
-+	 * these are things that the kernel wants me to keep, so users
-+	 * can find out semi-useless statistics of how well the card is
-+	 * performing
-+	 */
-+	struct net_device_stats stats;
-+
-+	/* version/revision of the SMC91x chip */
-+	int	version;
-+
-+	/* Contains the current active transmission mode */
-+	int	tcr_cur_mode;
-+
-+	/* Contains the current active receive mode */
-+	int	rcr_cur_mode;
-+
-+	/* Contains the current active receive/phy mode */
-+	int	rpc_cur_mode;
-+	int	ctl_rfduplx;
-+	int	ctl_rspeed;
-+
-+	u32	msg_enable;
-+	u32	phy_type;
-+	struct mii_if_info mii;
-+
-+	/* work queue */
-+	struct work_struct phy_configure;
-+	struct net_device *dev;
-+	int	work_pending;
-+
-+	spinlock_t lock;
-+
-+#ifdef SMC_USE_PXA_DMA
-+	/* DMA needs the physical address of the chip */
-+	u_long physaddr;
-+	struct device *device;
-+#endif
-+	void __iomem *base;
-+	void __iomem *datacs;
-+};
-+
-+
- #ifdef SMC_USE_PXA_DMA
- /*
-  * Let's use the DMA engine on the XScale PXA2xx for RX packets. This is
-@@ -475,11 +528,12 @@
- #ifdef SMC_insl
- #undef SMC_insl
- #define SMC_insl(a, r, p, l) \
--	smc_pxa_dma_insl(a, lp->physaddr, r, dev->dma, p, l)
-+	smc_pxa_dma_insl(a, lp, r, dev->dma, p, l)
- static inline void
--smc_pxa_dma_insl(void __iomem *ioaddr, u_long physaddr, int reg, int dma,
-+smc_pxa_dma_insl(void __iomem *ioaddr, struct smc_local *lp, int reg, int dma,
- 		 u_char *buf, int len)
- {
-+	u_long physaddr = lp->physaddr;
- 	dma_addr_t dmabuf;
- 
- 	/* fallback if no DMA available */
-@@ -496,7 +550,7 @@
- 	}
- 
- 	len *= 4;
--	dmabuf = dma_map_single(NULL, buf, len, DMA_FROM_DEVICE);
-+	dmabuf = dma_map_single(lp->device, buf, len, DMA_FROM_DEVICE);
- 	DCSR(dma) = DCSR_NODESC;
- 	DTADR(dma) = dmabuf;
- 	DSADR(dma) = physaddr + reg;
-@@ -506,18 +560,19 @@
- 	while (!(DCSR(dma) & DCSR_STOPSTATE))
- 		cpu_relax();
- 	DCSR(dma) = 0;
--	dma_unmap_single(NULL, dmabuf, len, DMA_FROM_DEVICE);
-+	dma_unmap_single(lp->device, dmabuf, len, DMA_FROM_DEVICE);
- }
- #endif
- 
- #ifdef SMC_insw
- #undef SMC_insw
- #define SMC_insw(a, r, p, l) \
--	smc_pxa_dma_insw(a, lp->physaddr, r, dev->dma, p, l)
-+	smc_pxa_dma_insw(a, lp, r, dev->dma, p, l)
- static inline void
--smc_pxa_dma_insw(void __iomem *ioaddr, u_long physaddr, int reg, int dma,
-+smc_pxa_dma_insw(void __iomem *ioaddr, struct smc_local *lp, int reg, int dma,
- 		 u_char *buf, int len)
- {
-+	u_long physaddr = lp->physaddr;
- 	dma_addr_t dmabuf;
- 
- 	/* fallback if no DMA available */
-@@ -534,7 +589,7 @@
- 	}
- 
- 	len *= 2;
--	dmabuf = dma_map_single(NULL, buf, len, DMA_FROM_DEVICE);
-+	dmabuf = dma_map_single(lp->device, buf, len, DMA_FROM_DEVICE);
- 	DCSR(dma) = DCSR_NODESC;
- 	DTADR(dma) = dmabuf;
- 	DSADR(dma) = physaddr + reg;
-@@ -544,7 +599,7 @@
- 	while (!(DCSR(dma) & DCSR_STOPSTATE))
- 		cpu_relax();
- 	DCSR(dma) = 0;
--	dma_unmap_single(NULL, dmabuf, len, DMA_FROM_DEVICE);
-+	dma_unmap_single(lp->device, dmabuf, len, DMA_FROM_DEVICE);
- }
- #endif
- 
---- linux-2.6.23.orig/drivers/serial/pxa.c
-+++ linux-2.6.23/drivers/serial/pxa.c
-@@ -42,6 +42,7 @@
- #include <linux/tty.h>
- #include <linux/tty_flip.h>
- #include <linux/serial_core.h>
-+#include <linux/clk.h>
- 
- #include <asm/io.h>
- #include <asm/hardware.h>
-@@ -56,7 +57,7 @@
- 	unsigned char           lcr;
- 	unsigned char           mcr;
- 	unsigned int            lsr_break_flag;
--	unsigned int		cken;
-+	struct clk		*clk;
- 	char			*name;
- };
- 
-@@ -363,6 +364,8 @@
- 	else
- 		up->mcr = 0;
- 
-+	up->port.uartclk = clk_get_rate(up->clk);
-+
- 	/*
- 	 * Allocate the IRQ
- 	 */
-@@ -568,9 +571,11 @@
- 	      unsigned int oldstate)
- {
- 	struct uart_pxa_port *up = (struct uart_pxa_port *)port;
--	pxa_set_cken(up->cken, !state);
-+
- 	if (!state)
--		udelay(1);
-+		clk_enable(up->clk);
-+	else
-+		clk_disable(up->clk);
- }
- 
- static void serial_pxa_release_port(struct uart_port *port)
-@@ -604,7 +609,7 @@
- 
- #ifdef CONFIG_SERIAL_PXA_CONSOLE
- 
--static struct uart_pxa_port serial_pxa_ports[];
-+static struct uart_pxa_port *serial_pxa_ports[4];
- static struct uart_driver serial_pxa_reg;
- 
- #define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
-@@ -654,9 +659,11 @@
- static void
- serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
- {
--	struct uart_pxa_port *up = &serial_pxa_ports[co->index];
-+	struct uart_pxa_port *up = serial_pxa_ports[co->index];
- 	unsigned int ier;
- 
-+	clk_enable(up->clk);
-+
- 	/*
- 	 *	First save the IER then disable the interrupts
- 	 */
-@@ -671,6 +678,8 @@
- 	 */
- 	wait_for_xmitr(up);
- 	serial_out(up, UART_IER, ier);
-+
-+	clk_disable(up->clk);
- }
- 
- static int __init
-@@ -684,7 +693,9 @@
- 
- 	if (co->index == -1 || co->index >= serial_pxa_reg.nr)
- 		co->index = 0;
--       	up = &serial_pxa_ports[co->index];
-+	up = serial_pxa_ports[co->index];
-+	if (!up)
-+		return -ENODEV;
- 
- 	if (options)
- 		uart_parse_options(options, &baud, &parity, &bits, &flow);
-@@ -702,15 +713,6 @@
- 	.data		= &serial_pxa_reg,
- };
- 
--static int __init
--serial_pxa_console_init(void)
--{
--	register_console(&serial_pxa_console);
--	return 0;
--}
--
--console_initcall(serial_pxa_console_init);
--
- #define PXA_CONSOLE	&serial_pxa_console
- #else
- #define PXA_CONSOLE	NULL
-@@ -736,73 +738,13 @@
- 	.verify_port	= serial_pxa_verify_port,
- };
- 
--static struct uart_pxa_port serial_pxa_ports[] = {
--     {	/* FFUART */
--	.name	= "FFUART",
--	.cken	= CKEN_FFUART,
--	.port	= {
--		.type		= PORT_PXA,
--		.iotype		= UPIO_MEM,
--		.membase	= (void *)&FFUART,
--		.mapbase	= __PREG(FFUART),
--		.irq		= IRQ_FFUART,
--		.uartclk	= 921600 * 16,
--		.fifosize	= 64,
--		.ops		= &serial_pxa_pops,
--		.line		= 0,
--	},
--  }, {	/* BTUART */
--	.name	= "BTUART",
--	.cken	= CKEN_BTUART,
--	.port	= {
--		.type		= PORT_PXA,
--		.iotype		= UPIO_MEM,
--		.membase	= (void *)&BTUART,
--		.mapbase	= __PREG(BTUART),
--		.irq		= IRQ_BTUART,
--		.uartclk	= 921600 * 16,
--		.fifosize	= 64,
--		.ops		= &serial_pxa_pops,
--		.line		= 1,
--	},
--  }, {	/* STUART */
--	.name	= "STUART",
--	.cken	= CKEN_STUART,
--	.port	= {
--		.type		= PORT_PXA,
--		.iotype		= UPIO_MEM,
--		.membase	= (void *)&STUART,
--		.mapbase	= __PREG(STUART),
--		.irq		= IRQ_STUART,
--		.uartclk	= 921600 * 16,
--		.fifosize	= 64,
--		.ops		= &serial_pxa_pops,
--		.line		= 2,
--	},
--  }, {  /* HWUART */
--	.name	= "HWUART",
--	.cken	= CKEN_HWUART,
--	.port = {
--		.type		= PORT_PXA,
--		.iotype		= UPIO_MEM,
--		.membase	= (void *)&HWUART,
--		.mapbase	= __PREG(HWUART),
--		.irq		= IRQ_HWUART,
--		.uartclk	= 921600 * 16,
--		.fifosize	= 64,
--		.ops		= &serial_pxa_pops,
--		.line		= 3,
--	},
--  }
--};
--
- static struct uart_driver serial_pxa_reg = {
- 	.owner		= THIS_MODULE,
- 	.driver_name	= "PXA serial",
- 	.dev_name	= "ttyS",
- 	.major		= TTY_MAJOR,
- 	.minor		= 64,
--	.nr		= ARRAY_SIZE(serial_pxa_ports),
-+	.nr		= 4,
- 	.cons		= PXA_CONSOLE,
- };
- 
-@@ -828,10 +770,68 @@
- 
- static int serial_pxa_probe(struct platform_device *dev)
- {
--	serial_pxa_ports[dev->id].port.dev = &dev->dev;
--	uart_add_one_port(&serial_pxa_reg, &serial_pxa_ports[dev->id].port);
--	platform_set_drvdata(dev, &serial_pxa_ports[dev->id]);
-+	struct uart_pxa_port *sport;
-+	struct resource *mmres, *irqres;
-+	int ret;
-+
-+	mmres = platform_get_resource(dev, IORESOURCE_MEM, 0);
-+	irqres = platform_get_resource(dev, IORESOURCE_IRQ, 0);
-+	if (!mmres || !irqres)
-+		return -ENODEV;
-+
-+	sport = kzalloc(sizeof(struct uart_pxa_port), GFP_KERNEL);
-+	if (!sport)
-+		return -ENOMEM;
-+
-+	sport->clk = clk_get(&dev->dev, "UARTCLK");
-+	if (IS_ERR(sport->clk)) {
-+		ret = PTR_ERR(sport->clk);
-+		goto err_free;
-+	}
-+
-+	sport->port.type = PORT_PXA;
-+	sport->port.iotype = UPIO_MEM;
-+	sport->port.mapbase = mmres->start;
-+	sport->port.irq = irqres->start;
-+	sport->port.fifosize = 64;
-+	sport->port.ops = &serial_pxa_pops;
-+	sport->port.line = dev->id;
-+	sport->port.dev = &dev->dev;
-+	sport->port.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF;
-+	sport->port.uartclk = clk_get_rate(sport->clk);
-+
-+	/*
-+	 * Is it worth keeping this?
-+	 */
-+	if (mmres->start == __PREG(FFUART))
-+		sport->name = "FFUART";
-+	else if (mmres->start == __PREG(BTUART))
-+		sport->name = "BTUART";
-+	else if (mmres->start == __PREG(STUART))
-+		sport->name = "STUART";
-+	else if (mmres->start == __PREG(HWUART))
-+		sport->name = "HWUART";
-+	else
-+		sport->name = "???";
-+
-+	sport->port.membase = ioremap(mmres->start, mmres->end - mmres->start + 1);
-+	if (!sport->port.membase) {
-+		ret = -ENOMEM;
-+		goto err_clk;
-+	}
-+
-+	serial_pxa_ports[dev->id] = sport;
-+
-+	uart_add_one_port(&serial_pxa_reg, &sport->port);
-+	platform_set_drvdata(dev, sport);
-+
- 	return 0;
-+
-+ err_clk:
-+	clk_put(sport->clk);
-+ err_free:
-+	kfree(sport);
-+	return ret;
- }
- 
- static int serial_pxa_remove(struct platform_device *dev)
-@@ -840,8 +840,9 @@
- 
- 	platform_set_drvdata(dev, NULL);
- 
--	if (sport)
--		uart_remove_one_port(&serial_pxa_reg, &sport->port);
-+	uart_remove_one_port(&serial_pxa_reg, &sport->port);
-+	clk_put(sport->clk);
-+	kfree(sport);
- 
- 	return 0;
- }
---- linux-2.6.23.orig/drivers/serial/serial_core.c
-+++ linux-2.6.23/drivers/serial/serial_core.c
-@@ -2128,6 +2128,14 @@
- 		spin_unlock_irqrestore(&port->lock, flags);
- 
- 		/*
-+		 * If this driver supports console, and it hasn't been
-+		 * successfully registered yet, try to re-register it.
-+		 * It may be that the port was not available.
-+		 */
-+		if (port->cons && !(port->cons->flags & CON_ENABLED))
-+			register_console(port->cons);
-+
-+		/*
- 		 * Power down all ports by default, except the
- 		 * console if we have one.
- 		 */
-@@ -2288,6 +2296,7 @@
- 	}
- 
- 	state->port = port;
-+	state->pm_state = -1;
- 
- 	port->cons = drv->cons;
- 	port->info = state->info;
-@@ -2310,15 +2319,6 @@
- 	tty_register_device(drv->tty_driver, port->line, port->dev);
- 
- 	/*
--	 * If this driver supports console, and it hasn't been
--	 * successfully registered yet, try to re-register it.
--	 * It may be that the port was not available.
--	 */
--	if (port->type != PORT_UNKNOWN &&
--	    port->cons && !(port->cons->flags & CON_ENABLED))
--		register_console(port->cons);
--
--	/*
- 	 * Ensure UPF_DEAD is not set.
- 	 */
- 	port->flags &= ~UPF_DEAD;
---- linux-2.6.23.orig/drivers/usb/gadget/pxa2xx_udc.c
-+++ linux-2.6.23/drivers/usb/gadget/pxa2xx_udc.c
-@@ -43,6 +43,8 @@
- #include <linux/platform_device.h>
- #include <linux/dma-mapping.h>
- #include <linux/irq.h>
-+#include <linux/clk.h>
-+#include <linux/err.h>
- 
- #include <asm/byteorder.h>
- #include <asm/dma.h>
-@@ -1157,7 +1159,7 @@
- 
- #ifdef	CONFIG_ARCH_PXA
-         /* Disable clock for USB device */
--	pxa_set_cken(CKEN_USB, 0);
-+	clk_disable(dev->clk);
- #endif
- 
- 	ep0_idle (dev);
-@@ -1202,8 +1204,7 @@
- 
- #ifdef	CONFIG_ARCH_PXA
-         /* Enable clock for USB device */
--	pxa_set_cken(CKEN_USB, 1);
--	udelay(5);
-+	clk_enable(dev->clk);
- #endif
- 
- 	/* try to clear these bits before we enable the udc */
-@@ -2137,6 +2138,14 @@
- 	if (irq < 0)
- 		return -ENODEV;
- 
-+#ifdef	CONFIG_ARCH_PXA
-+	dev->clk = clk_get(&pdev->dev, "UDCCLK");
-+	if (IS_ERR(dev->clk)) {
-+		retval = PTR_ERR(dev->clk);
-+		goto err_clk;
-+	}
-+#endif
-+
- 	pr_debug("%s: IRQ %d%s%s\n", driver_name, irq,
- 		dev->has_cfr ? "" : " (!cfr)",
- 		SIZE_STR "(pio)"
-@@ -2152,11 +2161,10 @@
- 			dev_dbg(&pdev->dev,
- 				"can't get vbus gpio %d, err: %d\n",
- 				dev->mach->gpio_vbus, retval);
--			return -EBUSY;
-+			goto err_gpio_vbus;
- 		}
- 		gpio_direction_input(dev->mach->gpio_vbus);
- 		vbus_irq = gpio_to_irq(dev->mach->gpio_vbus);
--		set_irq_type(vbus_irq, IRQT_BOTHEDGE);
- 	} else
- 		vbus_irq = 0;
- 
-@@ -2166,9 +2174,7 @@
- 			dev_dbg(&pdev->dev,
- 				"can't get pullup gpio %d, err: %d\n",
- 				dev->mach->gpio_pullup, retval);
--			if (dev->mach->gpio_vbus)
--				gpio_free(dev->mach->gpio_vbus);
--			return -EBUSY;
-+			goto err_gpio_pullup;
- 		}
- 		gpio_direction_output(dev->mach->gpio_pullup, 0);
- 	}
-@@ -2195,11 +2201,7 @@
- 	if (retval != 0) {
- 		printk(KERN_ERR "%s: can't get irq %d, err %d\n",
- 			driver_name, irq, retval);
--		if (dev->mach->gpio_pullup)
--			gpio_free(dev->mach->gpio_pullup);
--		if (dev->mach->gpio_vbus)
--			gpio_free(dev->mach->gpio_vbus);
--		return -EBUSY;
-+		goto err_irq1;
- 	}
- 	dev->got_irq = 1;
- 
-@@ -2213,12 +2215,7 @@
- 			printk(KERN_ERR "%s: can't get irq %i, err %d\n",
- 				driver_name, LUBBOCK_USB_DISC_IRQ, retval);
- lubbock_fail0:
--			free_irq(irq, dev);
--			if (dev->mach->gpio_pullup)
--				gpio_free(dev->mach->gpio_pullup);
--			if (dev->mach->gpio_vbus)
--				gpio_free(dev->mach->gpio_vbus);
--			return -EBUSY;
-+			goto err_irq_lub;
- 		}
- 		retval = request_irq(LUBBOCK_USB_IRQ,
- 				lubbock_vbus_irq,
-@@ -2234,22 +2231,37 @@
- #endif
- 	if (vbus_irq) {
- 		retval = request_irq(vbus_irq, udc_vbus_irq,
--				IRQF_DISABLED | IRQF_SAMPLE_RANDOM,
-+				IRQF_DISABLED | IRQF_SAMPLE_RANDOM |
-+				IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
- 				driver_name, dev);
- 		if (retval != 0) {
- 			printk(KERN_ERR "%s: can't get irq %i, err %d\n",
- 				driver_name, vbus_irq, retval);
--			free_irq(irq, dev);
--			if (dev->mach->gpio_pullup)
--				gpio_free(dev->mach->gpio_pullup);
--			if (dev->mach->gpio_vbus)
--				gpio_free(dev->mach->gpio_vbus);
--			return -EBUSY;
-+			goto err_vbus_irq;
- 		}
- 	}
- 	create_proc_files();
- 
- 	return 0;
-+
-+ err_vbus_irq:
-+#ifdef	CONFIG_ARCH_LUBBOCK
-+	free_irq(LUBBOCK_USB_DISC_IRQ, dev);
-+ err_irq_lub:
-+#endif
-+	free_irq(irq, dev);
-+ err_irq1:
-+	if (dev->mach->gpio_pullup)
-+		gpio_free(dev->mach->gpio_pullup);
-+ err_gpio_pullup:
-+	if (dev->mach->gpio_vbus)
-+		gpio_free(dev->mach->gpio_vbus);
-+ err_gpio_vbus:
-+#ifdef	CONFIG_ARCH_PXA
-+	clk_put(dev->clk);
-+ err_clk:
-+#endif
-+	return retval;
- }
- 
- static void pxa2xx_udc_shutdown(struct platform_device *_dev)
-@@ -2284,6 +2296,10 @@
- 	if (dev->mach->gpio_pullup)
- 		gpio_free(dev->mach->gpio_pullup);
- 
-+#ifdef	CONFIG_ARCH_PXA
-+	clk_put(dev->clk);
-+#endif
-+
- 	platform_set_drvdata(pdev, NULL);
- 	the_controller = NULL;
- 	return 0;
---- linux-2.6.23.orig/drivers/usb/gadget/pxa2xx_udc.h
-+++ linux-2.6.23/drivers/usb/gadget/pxa2xx_udc.h
-@@ -125,6 +125,7 @@
- 	struct timer_list			timer;
- 
- 	struct device				*dev;
-+	struct clk				*clk;
- 	struct pxa2xx_udc_mach_info		*mach;
- 	u64					dma_mask;
- 	struct pxa2xx_ep			ep [PXA_UDC_NUM_ENDPOINTS];
---- linux-2.6.23.orig/drivers/video/pxafb.c
-+++ linux-2.6.23/drivers/video/pxafb.c
-@@ -37,6 +37,8 @@
- #include <linux/cpufreq.h>
- #include <linux/platform_device.h>
- #include <linux/dma-mapping.h>
-+#include <linux/clk.h>
-+#include <linux/err.h>
- 
- #include <asm/hardware.h>
- #include <asm/io.h>
-@@ -574,15 +576,15 @@
-  *
-  * Factoring the 10^4 and 10^-12 out gives 10^-8 == 1 / 100000000 as used below.
-  */
--static inline unsigned int get_pcd(unsigned int pixclock)
-+static inline unsigned int get_pcd(struct pxafb_info *fbi, unsigned int pixclock)
- {
- 	unsigned long long pcd;
- 
- 	/* FIXME: Need to take into account Double Pixel Clock mode
--         * (DPC) bit? or perhaps set it based on the various clock
--         * speeds */
--
--	pcd = (unsigned long long)get_lcdclk_frequency_10khz() * pixclock;
-+	 * (DPC) bit? or perhaps set it based on the various clock
-+	 * speeds */
-+	pcd = (unsigned long long)(clk_get_rate(fbi->clk) / 10000);
-+	pcd *= pixclock;
- 	do_div(pcd, 100000000 * 2);
- 	/* no need for this, since we should subtract 1 anyway. they cancel */
- 	/* pcd += 1; */ /* make up for integer math truncations */
-@@ -591,19 +593,21 @@
- 
- /*
-  * Some touchscreens need hsync information from the video driver to
-- * function correctly. We export it here.
-+ * function correctly. We export it here.  Note that 'hsync_time' and
-+ * the value returned from pxafb_get_hsync_time() is the *reciprocal*
-+ * of the hsync period in seconds.
-  */
- static inline void set_hsync_time(struct pxafb_info *fbi, unsigned int pcd)
- {
--	unsigned long long htime;
-+	unsigned long htime;
- 
- 	if ((pcd == 0) || (fbi->fb.var.hsync_len == 0)) {
- 		fbi->hsync_time=0;
- 		return;
- 	}
- 
--	htime = (unsigned long long)get_lcdclk_frequency_10khz() * 10000;
--	do_div(htime, pcd * fbi->fb.var.hsync_len);
-+	htime = clk_get_rate(fbi->clk) / (pcd * fbi->fb.var.hsync_len);
-+
- 	fbi->hsync_time = htime;
- }
- 
-@@ -628,7 +632,7 @@
- {
- 	struct pxafb_lcd_reg new_regs;
- 	u_long flags;
--	u_int lines_per_panel, pcd = get_pcd(var->pixclock);
-+	u_int lines_per_panel, pcd = get_pcd(fbi, var->pixclock);
- 
- 	pr_debug("pxafb: Configuring PXA LCD\n");
- 
-@@ -908,7 +912,7 @@
- 	pr_debug("reg_lccr3 0x%08x\n", (unsigned int) fbi->reg_lccr3);
- 
- 	/* enable LCD controller clock */
--	pxa_set_cken(CKEN_LCD, 1);
-+	clk_enable(fbi->clk);
- 
- 	down(&fcs_lcd_sem);
- 	/* Sequence from 11.7.10 */
-@@ -950,7 +954,7 @@
- 	up(&fcs_lcd_sem);
- 
- 	/* disable LCD controller clock */
--	pxa_set_cken(CKEN_LCD, 0);
-+	clk_disable(fbi->clk);
- }
- 
- /*
-@@ -1161,7 +1165,7 @@
- 		if ((clkinfo->old == 13000))
- 			break;
- 
--		pcd = get_pcd(fbi->fb.var.pixclock);
-+		pcd = get_pcd(fbi, fbi->fb.var.pixclock);
- 		lccr3 = fbi->reg_lccr3;
- 		set_hsync_time(fbi, pcd);
- 		fbi->reg_lccr3 = (fbi->reg_lccr3 & ~0xff) | LCCR3_PixClkDiv(pcd);
-@@ -1293,6 +1297,12 @@
- 	memset(fbi, 0, sizeof(struct pxafb_info));
- 	fbi->dev = dev;
- 
-+	fbi->clk = clk_get(dev, "LCDCLK");
-+	if (IS_ERR(fbi->clk)) {
-+		kfree(fbi);
-+		return NULL;
-+	}
-+
- 	strcpy(fbi->fb.fix.id, PXA_NAME);
- 
- 	fbi->fb.fix.type	= FB_TYPE_PACKED_PIXELS;
---- linux-2.6.23.orig/drivers/video/pxafb.h
-+++ linux-2.6.23/drivers/video/pxafb.h
-@@ -94,6 +94,7 @@
- struct pxafb_info {
- 	struct fb_info		fb;
- 	struct device		*dev;
-+	struct clk		*clk;
- 
- 	/*
- 	 * These are the addresses we mapped
---- linux-2.6.23.orig/include/asm-arm/arch-pxa/hardware.h
-+++ linux-2.6.23/include/asm-arm/arch-pxa/hardware.h
-@@ -80,6 +80,24 @@
- 		_id == 0x411;				\
- 	})
- 
-+#define __cpu_is_pxa300(id)				\
-+	({						\
-+		unsigned int _id = (id) >> 4 & 0xfff;	\
-+		_id == 0x688;				\
-+	 })
-+
-+#define __cpu_is_pxa310(id)				\
-+	({						\
-+		unsigned int _id = (id) >> 4 & 0xfff;	\
-+		_id == 0x689;				\
-+	 })
-+
-+#define __cpu_is_pxa320(id)				\
-+	({						\
-+		unsigned int _id = (id) >> 4 & 0xfff;	\
-+		_id == 0x603 || _id == 0x682;		\
-+	 })
-+
- #define cpu_is_pxa21x()					\
- 	({						\
- 		unsigned int id = read_cpuid(CPUID_ID);	\
-@@ -98,6 +116,53 @@
- 		__cpu_is_pxa27x(id);			\
- 	})
- 
-+#define cpu_is_pxa300()					\
-+	({						\
-+		unsigned int id = read_cpuid(CPUID_ID);	\
-+		__cpu_is_pxa300(id);			\
-+	 })
-+
-+#define cpu_is_pxa310()					\
-+	({						\
-+		unsigned int id = read_cpuid(CPUID_ID);	\
-+		__cpu_is_pxa310(id);			\
-+	 })
-+
-+#define cpu_is_pxa320()					\
-+	({						\
-+		unsigned int id = read_cpuid(CPUID_ID);	\
-+		__cpu_is_pxa320(id);			\
-+	 })
-+
-+/*
-+ * CPUID Core Generation Bit
-+ * <= 0x2 for pxa21x/pxa25x/pxa26x/pxa27x
-+ * == 0x3 for pxa300/pxa310/pxa320
-+ */
-+#define __cpu_is_pxa2xx(id)				\
-+	({						\
-+		unsigned int _id = (id) >> 13 & 0x7;	\
-+		_id <= 0x2;				\
-+	 })
-+
-+#define __cpu_is_pxa3xx(id)				\
-+	({						\
-+		unsigned int _id = (id) >> 13 & 0x7;	\
-+		_id == 0x3;				\
-+	 })
-+
-+#define cpu_is_pxa2xx()					\
-+	({						\
-+		unsigned int id = read_cpuid(CPUID_ID);	\
-+		__cpu_is_pxa2xx(id);			\
-+	 })
-+
-+#define cpu_is_pxa3xx()					\
-+	({						\
-+		unsigned int id = read_cpuid(CPUID_ID);	\
-+		__cpu_is_pxa3xx(id);			\
-+	 })
-+
- /*
-  * Handy routine to set GPIO alternate functions
-  */
-@@ -116,13 +181,16 @@
- /*
-  * Routine to enable or disable CKEN
-  */
--extern void pxa_set_cken(int clock, int enable);
-+static inline void __deprecated pxa_set_cken(int clock, int enable)
-+{
-+	extern void __pxa_set_cken(int clock, int enable);
-+	__pxa_set_cken(clock, enable);
-+}
- 
- /*
-  * return current memory and LCD clock frequency in units of 10kHz
-  */
- extern unsigned int get_memclk_frequency_10khz(void);
--extern unsigned int get_lcdclk_frequency_10khz(void);
- 
- #endif
- 
---- linux-2.6.23.orig/include/asm-arm/arch-pxa/irqs.h
-+++ linux-2.6.23/include/asm-arm/arch-pxa/irqs.h
-@@ -66,12 +66,6 @@
- #define IRQ_TO_GPIO_2_x(i)	((i) - PXA_GPIO_IRQ_BASE)
- #define IRQ_TO_GPIO(i)	(((i) < IRQ_GPIO(2)) ? ((i) - IRQ_GPIO0) : IRQ_TO_GPIO_2_x(i))
- 
--#if defined(CONFIG_PXA25x)
--#define PXA_LAST_GPIO	84
--#elif defined(CONFIG_PXA27x)
--#define PXA_LAST_GPIO	127
--#endif
--
- /*
-  * The next 16 interrupts are for board specific purposes.  Since
-  * the kernel can only run on one machine at a time, we can re-use
---- /dev/null
-+++ linux-2.6.23/include/asm-arm/arch-pxa/mfp-pxa300.h
-@@ -0,0 +1,574 @@
-+/*
-+ * linux/include/asm-arm/arch-pxa/mfp-pxa300.h
-+ *
-+ * PXA300/PXA310 specific MFP configuration definitions
-+ *
-+ * Copyright (C) 2007 Marvell International Ltd.
-+ * 2007-08-21: eric miao <eric.y.miao@gmail.com>
-+ *             initial version
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License version 2 as
-+ *  published by the Free Software Foundation.
-+ */
-+
-+#ifndef __ASM_ARCH_MFP_PXA300_H
-+#define __ASM_ARCH_MFP_PXA300_H
-+
-+#include <asm/arch/mfp.h>
-+
-+/* GPIO */
-+#define GPIO46_GPIO		MFP_CFG(GPIO46, AF1)
-+#define GPIO49_GPIO		MFP_CFG(GPIO49, AF3)
-+#define GPIO50_GPIO		MFP_CFG(GPIO50, AF2)
-+#define GPIO51_GPIO		MFP_CFG(GPIO51, AF3)
-+#define GPIO52_GPIO		MFP_CFG(GPIO52, AF3)
-+#define GPIO56_GPIO		MFP_CFG(GPIO56, AF0)
-+#define GPIO58_GPIO		MFP_CFG(GPIO58, AF0)
-+#define GPIO59_GPIO		MFP_CFG(GPIO59, AF0)
-+#define GPIO60_GPIO		MFP_CFG(GPIO60, AF0)
-+#define GPIO61_GPIO		MFP_CFG(GPIO61, AF0)
-+#define GPIO62_GPIO		MFP_CFG(GPIO62, AF0)
-+
-+#ifdef CONFIG_CPU_PXA310
-+#define GPIO7_2_GPIO		MFP_CFG(GPIO7_2, AF0)
-+#define GPIO8_2_GPIO		MFP_CFG(GPIO8_2, AF0)
-+#define GPIO9_2_GPIO		MFP_CFG(GPIO9_2, AF0)
-+#define GPIO10_2_GPIO		MFP_CFG(GPIO10_2, AF0)
-+#define GPIO11_2_GPIO		MFP_CFG(GPIO11_2, AF0)
-+#define GPIO12_2_GPIO		MFP_CFG(GPIO12_2, AF0)
-+#endif
-+
-+/* Chip Select */
-+#define GPIO2_nCS3		MFP_CFG(GPIO2,  AF1)
-+
-+/* AC97 */
-+#define GPIO23_AC97_nACRESET	MFP_CFG(GPIO23, AF1)
-+#define GPIO24_AC97_SYSCLK	MFP_CFG(GPIO24, AF1)
-+#define GPIO29_AC97_BITCLK	MFP_CFG(GPIO29, AF1)
-+#define GPIO25_AC97_SDATA_IN_0	MFP_CFG(GPIO25, AF1)
-+#define GPIO26_AC97_SDATA_IN_1	MFP_CFG(GPIO26, AF1)
-+#define GPIO17_AC97_SDATA_IN_2	MFP_CFG(GPIO17, AF3)
-+#define GPIO21_AC97_SDATA_IN_2	MFP_CFG(GPIO21, AF2)
-+#define GPIO18_AC97_SDATA_IN_3	MFP_CFG(GPIO18, AF3)
-+#define GPIO22_AC97_SDATA_IN_3	MFP_CFG(GPIO22, AF2)
-+#define GPIO27_AC97_SDATA_OUT	MFP_CFG(GPIO27, AF1)
-+#define GPIO28_AC97_SYNC	MFP_CFG(GPIO28, AF1)
-+
-+/* I2C */
-+#define GPIO21_I2C_SCL		MFP_CFG_LPM(GPIO21, AF1, PULL_HIGH)
-+#define GPIO22_I2C_SDA		MFP_CFG_LPM(GPIO22, AF1, PULL_HIGH)
-+
-+/* QCI */
-+#define GPIO39_CI_DD_0		MFP_CFG_DRV(GPIO39, AF1, DS04X)
-+#define GPIO40_CI_DD_1		MFP_CFG_DRV(GPIO40, AF1, DS04X)
-+#define GPIO41_CI_DD_2		MFP_CFG_DRV(GPIO41, AF1, DS04X)
-+#define GPIO42_CI_DD_3		MFP_CFG_DRV(GPIO42, AF1, DS04X)
-+#define GPIO43_CI_DD_4		MFP_CFG_DRV(GPIO43, AF1, DS04X)
-+#define GPIO44_CI_DD_5		MFP_CFG_DRV(GPIO44, AF1, DS04X)
-+#define GPIO45_CI_DD_6		MFP_CFG_DRV(GPIO45, AF1, DS04X)
-+#define GPIO46_CI_DD_7		MFP_CFG_DRV(GPIO46, AF0, DS04X)
-+#define GPIO47_CI_DD_8		MFP_CFG_DRV(GPIO47, AF1, DS04X)
-+#define GPIO48_CI_DD_9		MFP_CFG_DRV(GPIO48, AF1, DS04X)
-+#define GPIO52_CI_HSYNC		MFP_CFG_DRV(GPIO52, AF0, DS04X)
-+#define GPIO51_CI_VSYNC		MFP_CFG_DRV(GPIO51, AF0, DS04X)
-+#define GPIO49_CI_MCLK		MFP_CFG_DRV(GPIO49, AF0, DS04X)
-+#define GPIO50_CI_PCLK		MFP_CFG_DRV(GPIO50, AF0, DS04X)
-+
-+/* KEYPAD */
-+#define GPIO3_KP_DKIN_6		MFP_CFG_LPM(GPIO3,   AF2, FLOAT)
-+#define GPIO4_KP_DKIN_7		MFP_CFG_LPM(GPIO4,   AF2, FLOAT)
-+#define GPIO16_KP_DKIN_6	MFP_CFG_LPM(GPIO16,  AF6, FLOAT)
-+#define GPIO83_KP_DKIN_2	MFP_CFG_LPM(GPIO83,  AF5, FLOAT)
-+#define GPIO84_KP_DKIN_1	MFP_CFG_LPM(GPIO84,  AF5, FLOAT)
-+#define GPIO85_KP_DKIN_0	MFP_CFG_LPM(GPIO85,  AF3, FLOAT)
-+#define GPIO86_KP_DKIN_1	MFP_CFG_LPM(GPIO86,  AF3, FLOAT)
-+#define GPIO87_KP_DKIN_2	MFP_CFG_LPM(GPIO87,  AF3, FLOAT)
-+#define GPIO88_KP_DKIN_3	MFP_CFG_LPM(GPIO88,  AF3, FLOAT)
-+#define GPIO89_KP_DKIN_3	MFP_CFG_LPM(GPIO89,  AF3, FLOAT)
-+#define GPIO107_KP_DKIN_0	MFP_CFG_LPM(GPIO107, AF2, FLOAT)
-+#define GPIO108_KP_DKIN_1	MFP_CFG_LPM(GPIO108, AF2, FLOAT)
-+#define GPIO109_KP_DKIN_2	MFP_CFG_LPM(GPIO109, AF2, FLOAT)
-+#define GPIO110_KP_DKIN_3	MFP_CFG_LPM(GPIO110, AF2, FLOAT)
-+#define GPIO111_KP_DKIN_4	MFP_CFG_LPM(GPIO111, AF2, FLOAT)
-+#define GPIO112_KP_DKIN_5	MFP_CFG_LPM(GPIO112, AF2, FLOAT)
-+#define GPIO113_KP_DKIN_6	MFP_CFG_LPM(GPIO113, AF2, FLOAT)
-+#define GPIO114_KP_DKIN_7	MFP_CFG_LPM(GPIO114, AF2, FLOAT)
-+#define GPIO115_KP_DKIN_0	MFP_CFG_LPM(GPIO115, AF2, FLOAT)
-+#define GPIO116_KP_DKIN_1	MFP_CFG_LPM(GPIO116, AF2, FLOAT)
-+#define GPIO117_KP_DKIN_2	MFP_CFG_LPM(GPIO117, AF2, FLOAT)
-+#define GPIO118_KP_DKIN_3	MFP_CFG_LPM(GPIO118, AF2, FLOAT)
-+#define GPIO119_KP_DKIN_4	MFP_CFG_LPM(GPIO119, AF2, FLOAT)
-+#define GPIO120_KP_DKIN_5	MFP_CFG_LPM(GPIO120, AF2, FLOAT)
-+#define GPIO121_KP_DKIN_6	MFP_CFG_LPM(GPIO121, AF2, FLOAT)
-+#define GPIO122_KP_DKIN_5	MFP_CFG_LPM(GPIO122, AF2, FLOAT)
-+#define GPIO123_KP_DKIN_4	MFP_CFG_LPM(GPIO123, AF2, FLOAT)
-+#define GPIO124_KP_DKIN_3	MFP_CFG_LPM(GPIO124, AF2, FLOAT)
-+#define GPIO127_KP_DKIN_0	MFP_CFG_LPM(GPIO127, AF5, FLOAT)
-+#define GPIO0_2_KP_DKIN_0	MFP_CFG_LPM(GPIO0_2, AF2, FLOAT)
-+#define GPIO1_2_KP_DKIN_1	MFP_CFG_LPM(GPIO1_2, AF2, FLOAT)
-+#define GPIO2_2_KP_DKIN_6	MFP_CFG_LPM(GPIO2_2, AF2, FLOAT)
-+#define GPIO3_2_KP_DKIN_7	MFP_CFG_LPM(GPIO3_2, AF2, FLOAT)
-+#define GPIO4_2_KP_DKIN_1	MFP_CFG_LPM(GPIO4_2, AF2, FLOAT)
-+#define GPIO5_2_KP_DKIN_0	MFP_CFG_LPM(GPIO5_2, AF2, FLOAT)
-+
-+#define GPIO5_KP_MKIN_0		MFP_CFG_LPM(GPIO5,   AF2, FLOAT)
-+#define GPIO6_KP_MKIN_1		MFP_CFG_LPM(GPIO6,   AF2, FLOAT)
-+#define GPIO9_KP_MKIN_6		MFP_CFG_LPM(GPIO9,   AF3, FLOAT)
-+#define GPIO10_KP_MKIN_7	MFP_CFG_LPM(GPIO10,  AF3, FLOAT)
-+#define GPIO70_KP_MKIN_6	MFP_CFG_LPM(GPIO70,  AF3, FLOAT)
-+#define GPIO71_KP_MKIN_7	MFP_CFG_LPM(GPIO71,  AF3, FLOAT)
-+#define GPIO100_KP_MKIN_6	MFP_CFG_LPM(GPIO100, AF7, FLOAT)
-+#define GPIO101_KP_MKIN_7	MFP_CFG_LPM(GPIO101, AF7, FLOAT)
-+#define GPIO112_KP_MKIN_6	MFP_CFG_LPM(GPIO112, AF4, FLOAT)
-+#define GPIO113_KP_MKIN_7	MFP_CFG_LPM(GPIO113, AF4, FLOAT)
-+#define GPIO115_KP_MKIN_0	MFP_CFG_LPM(GPIO115, AF1, FLOAT)
-+#define GPIO116_KP_MKIN_1	MFP_CFG_LPM(GPIO116, AF1, FLOAT)
-+#define GPIO117_KP_MKIN_2	MFP_CFG_LPM(GPIO117, AF1, FLOAT)
-+#define GPIO118_KP_MKIN_3	MFP_CFG_LPM(GPIO118, AF1, FLOAT)
-+#define GPIO119_KP_MKIN_4	MFP_CFG_LPM(GPIO119, AF1, FLOAT)
-+#define GPIO120_KP_MKIN_5	MFP_CFG_LPM(GPIO120, AF1, FLOAT)
-+#define GPIO125_KP_MKIN_2	MFP_CFG_LPM(GPIO125, AF2, FLOAT)
-+#define GPIO2_2_KP_MKIN_6	MFP_CFG_LPM(GPIO2_2, AF1, FLOAT)
-+#define GPIO3_2_KP_MKIN_7	MFP_CFG_LPM(GPIO3_2, AF1, FLOAT)
-+
-+#define GPIO7_KP_MKOUT_5	MFP_CFG_LPM(GPIO7,   AF1, DRIVE_HIGH)
-+#define GPIO11_KP_MKOUT_5	MFP_CFG_LPM(GPIO11,  AF3, DRIVE_HIGH)
-+#define GPIO12_KP_MKOUT_6	MFP_CFG_LPM(GPIO12,  AF3, DRIVE_HIGH)
-+#define GPIO13_KP_MKOUT_7	MFP_CFG_LPM(GPIO13,  AF3, DRIVE_HIGH)
-+#define GPIO19_KP_MKOUT_4	MFP_CFG_LPM(GPIO19,  AF3, DRIVE_HIGH)
-+#define GPIO20_KP_MKOUT_5	MFP_CFG_LPM(GPIO20,  AF3, DRIVE_HIGH)
-+#define GPIO38_KP_MKOUT_5	MFP_CFG_LPM(GPIO38,  AF5, DRIVE_HIGH)
-+#define GPIO53_KP_MKOUT_6	MFP_CFG_LPM(GPIO53,  AF5, DRIVE_HIGH)
-+#define GPIO78_KP_MKOUT_7	MFP_CFG_LPM(GPIO78,  AF5, DRIVE_HIGH)
-+#define GPIO85_KP_MKOUT_0	MFP_CFG_LPM(GPIO85,  AF2, DRIVE_HIGH)
-+#define GPIO86_KP_MKOUT_1	MFP_CFG_LPM(GPIO86,  AF2, DRIVE_HIGH)
-+#define GPIO87_KP_MKOUT_2	MFP_CFG_LPM(GPIO87,  AF2, DRIVE_HIGH)
-+#define GPIO88_KP_MKOUT_3	MFP_CFG_LPM(GPIO88,  AF2, DRIVE_HIGH)
-+#define GPIO104_KP_MKOUT_6	MFP_CFG_LPM(GPIO104, AF5, DRIVE_HIGH)
-+#define GPIO105_KP_MKOUT_7	MFP_CFG_LPM(GPIO105, AF5, DRIVE_HIGH)
-+#define GPIO121_KP_MKOUT_0	MFP_CFG_LPM(GPIO121, AF1, DRIVE_HIGH)
-+#define GPIO122_KP_MKOUT_1	MFP_CFG_LPM(GPIO122, AF1, DRIVE_HIGH)
-+#define GPIO123_KP_MKOUT_2	MFP_CFG_LPM(GPIO123, AF1, DRIVE_HIGH)
-+#define GPIO124_KP_MKOUT_3	MFP_CFG_LPM(GPIO124, AF1, DRIVE_HIGH)
-+#define GPIO125_KP_MKOUT_4	MFP_CFG_LPM(GPIO125, AF1, DRIVE_HIGH)
-+#define GPIO126_KP_MKOUT_7	MFP_CFG_LPM(GPIO126, AF4, DRIVE_HIGH)
-+#define GPIO5_2_KP_MKOUT_6	MFP_CFG_LPM(GPIO5_2, AF1, DRIVE_HIGH)
-+#define GPIO4_2_KP_MKOUT_5	MFP_CFG_LPM(GPIO4_2, AF1, DRIVE_HIGH)
-+#define GPIO6_2_KP_MKOUT_7	MFP_CFG_LPM(GPIO6_2, AF1, DRIVE_HIGH)
-+
-+/* LCD */
-+#define GPIO54_LCD_LDD_0	MFP_CFG_DRV(GPIO54, AF1, DS01X)
-+#define GPIO55_LCD_LDD_1	MFP_CFG_DRV(GPIO55, AF1, DS01X)
-+#define GPIO56_LCD_LDD_2	MFP_CFG_DRV(GPIO56, AF1, DS01X)
-+#define GPIO57_LCD_LDD_3	MFP_CFG_DRV(GPIO57, AF1, DS01X)
-+#define GPIO58_LCD_LDD_4	MFP_CFG_DRV(GPIO58, AF1, DS01X)
-+#define GPIO59_LCD_LDD_5	MFP_CFG_DRV(GPIO59, AF1, DS01X)
-+#define GPIO60_LCD_LDD_6	MFP_CFG_DRV(GPIO60, AF1, DS01X)
-+#define GPIO61_LCD_LDD_7	MFP_CFG_DRV(GPIO61, AF1, DS01X)
-+#define GPIO62_LCD_LDD_8	MFP_CFG_DRV(GPIO62, AF1, DS01X)
-+#define GPIO63_LCD_LDD_9	MFP_CFG_DRV(GPIO63, AF1, DS01X)
-+#define GPIO64_LCD_LDD_10	MFP_CFG_DRV(GPIO64, AF1, DS01X)
-+#define GPIO65_LCD_LDD_11	MFP_CFG_DRV(GPIO65, AF1, DS01X)
-+#define GPIO66_LCD_LDD_12	MFP_CFG_DRV(GPIO66, AF1, DS01X)
-+#define GPIO67_LCD_LDD_13	MFP_CFG_DRV(GPIO67, AF1, DS01X)
-+#define GPIO68_LCD_LDD_14	MFP_CFG_DRV(GPIO68, AF1, DS01X)
-+#define GPIO69_LCD_LDD_15	MFP_CFG_DRV(GPIO69, AF1, DS01X)
-+#define GPIO70_LCD_LDD_16	MFP_CFG_DRV(GPIO70, AF1, DS01X)
-+#define GPIO71_LCD_LDD_17	MFP_CFG_DRV(GPIO71, AF1, DS01X)
-+#define GPIO62_LCD_CS_N		MFP_CFG_DRV(GPIO62, AF2, DS01X)
-+#define GPIO72_LCD_FCLK		MFP_CFG_DRV(GPIO72, AF1, DS01X)
-+#define GPIO73_LCD_LCLK		MFP_CFG_DRV(GPIO73, AF1, DS01X)
-+#define GPIO74_LCD_PCLK		MFP_CFG_DRV(GPIO74, AF1, DS01X)
-+#define GPIO75_LCD_BIAS		MFP_CFG_DRV(GPIO75, AF1, DS01X)
-+#define GPIO76_LCD_VSYNC	MFP_CFG_DRV(GPIO76, AF2, DS01X)
-+
-+#define GPIO15_LCD_CS_N		MFP_CFG_DRV(GPIO15,  AF2, DS01X)
-+#define GPIO127_LCD_CS_N	MFP_CFG_DRV(GPIO127, AF1, DS01X)
-+#define GPIO63_LCD_VSYNC	MFP_CFG_DRV(GPIO63,  AF2, DS01X)
-+
-+/* Mini-LCD */
-+#define GPIO72_MLCD_FCLK	MFP_CFG_DRV(GPIO72, AF7, DS08X)
-+#define GPIO73_MLCD_LCLK	MFP_CFG_DRV(GPIO73, AF7, DS08X)
-+#define GPIO54_MLCD_LDD_0	MFP_CFG_DRV(GPIO54, AF7, DS08X)
-+#define GPIO55_MLCD_LDD_1	MFP_CFG_DRV(GPIO55, AF7, DS08X)
-+#define GPIO56_MLCD_LDD_2	MFP_CFG_DRV(GPIO56, AF7, DS08X)
-+#define GPIO57_MLCD_LDD_3	MFP_CFG_DRV(GPIO57, AF7, DS08X)
-+#define GPIO58_MLCD_LDD_4	MFP_CFG_DRV(GPIO58, AF7, DS08X)
-+#define GPIO59_MLCD_LDD_5	MFP_CFG_DRV(GPIO59, AF7, DS08X)
-+#define GPIO60_MLCD_LDD_6	MFP_CFG_DRV(GPIO60, AF7, DS08X)
-+#define GPIO61_MLCD_LDD_7	MFP_CFG_DRV(GPIO61, AF7, DS08X)
-+#define GPIO62_MLCD_LDD_8	MFP_CFG_DRV(GPIO62, AF7, DS08X)
-+#define GPIO63_MLCD_LDD_9	MFP_CFG_DRV(GPIO63, AF7, DS08X)
-+#define GPIO64_MLCD_LDD_10	MFP_CFG_DRV(GPIO64, AF7, DS08X)
-+#define GPIO65_MLCD_LDD_11	MFP_CFG_DRV(GPIO65, AF7, DS08X)
-+#define GPIO66_MLCD_LDD_12	MFP_CFG_DRV(GPIO66, AF7, DS08X)
-+#define GPIO67_MLCD_LDD_13	MFP_CFG_DRV(GPIO67, AF7, DS08X)
-+#define GPIO68_MLCD_LDD_14	MFP_CFG_DRV(GPIO68, AF7, DS08X)
-+#define GPIO69_MLCD_LDD_15	MFP_CFG_DRV(GPIO69, AF7, DS08X)
-+#define GPIO74_MLCD_PCLK	MFP_CFG_DRV(GPIO74, AF7, DS08X)
-+#define GPIO75_MLCD_BIAS	MFP_CFG_DRV(GPIO75, AF2, DS08X)
-+
-+/* MMC1 */
-+#define GPIO7_MMC1_CLK		MFP_CFG_LPM(GPIO7,  AF4, DRIVE_HIGH)
-+#define GPIO8_MMC1_CMD		MFP_CFG_LPM(GPIO8,  AF4, DRIVE_HIGH)
-+#define GPIO14_MMC1_CMD		MFP_CFG_LPM(GPIO14, AF5, DRIVE_HIGH)
-+#define GPIO15_MMC1_CMD		MFP_CFG_LPM(GPIO15, AF5, DRIVE_HIGH)
-+#define GPIO3_MMC1_DAT0		MFP_CFG_LPM(GPIO3,  AF4, DRIVE_HIGH)
-+#define GPIO4_MMC1_DAT1		MFP_CFG_LPM(GPIO4,  AF4, DRIVE_HIGH)
-+#define GPIO5_MMC1_DAT2		MFP_CFG_LPM(GPIO5,  AF4, DRIVE_HIGH)
-+#define GPIO6_MMC1_DAT3		MFP_CFG_LPM(GPIO6,  AF4, DRIVE_HIGH)
-+
-+/* MMC2 */
-+#define GPIO9_MMC2_DAT0		MFP_CFG_LPM(GPIO9,  AF4, PULL_HIGH)
-+#define GPIO10_MMC2_DAT1	MFP_CFG_LPM(GPIO10, AF4, PULL_HIGH)
-+#define GPIO11_MMC2_DAT2	MFP_CFG_LPM(GPIO11, AF4, PULL_HIGH)
-+#define GPIO12_MMC2_DAT3	MFP_CFG_LPM(GPIO12, AF4, PULL_HIGH)
-+#define GPIO13_MMC2_CLK		MFP_CFG_LPM(GPIO13, AF4, PULL_HIGH)
-+#define GPIO14_MMC2_CMD		MFP_CFG_LPM(GPIO14, AF4, PULL_HIGH)
-+#define GPIO77_MMC2_DAT0	MFP_CFG_LPM(GPIO77, AF4, PULL_HIGH)
-+#define GPIO78_MMC2_DAT1	MFP_CFG_LPM(GPIO78, AF4, PULL_HIGH)
-+#define GPIO79_MMC2_DAT2	MFP_CFG_LPM(GPIO79, AF4, PULL_HIGH)
-+#define GPIO80_MMC2_DAT3	MFP_CFG_LPM(GPIO80, AF4, PULL_HIGH)
-+#define GPIO81_MMC2_CLK		MFP_CFG_LPM(GPIO81, AF4, PULL_HIGH)
-+#define GPIO82_MMC2_CMD		MFP_CFG_LPM(GPIO82, AF4, PULL_HIGH)
-+
-+/* SSP1 */
-+#define GPIO89_SSP1_EXTCLK	MFP_CFG(GPIO89, AF1)
-+#define GPIO90_SSP1_SYSCLK	MFP_CFG(GPIO90, AF1)
-+#define GPIO15_SSP1_SCLK	MFP_CFG(GPIO15, AF6)
-+#define GPIO16_SSP1_FRM		MFP_CFG(GPIO16, AF2)
-+#define GPIO33_SSP1_SCLK	MFP_CFG(GPIO33, AF5)
-+#define GPIO34_SSP1_FRM		MFP_CFG(GPIO34, AF5)
-+#define GPIO85_SSP1_SCLK	MFP_CFG(GPIO85, AF1)
-+#define GPIO86_SSP1_FRM		MFP_CFG(GPIO86, AF1)
-+#define GPIO18_SSP1_TXD		MFP_CFG(GPIO18, AF7)
-+#define GPIO18_SSP1_RXD		MFP_CFG(GPIO18, AF2)
-+#define GPIO20_SSP1_TXD		MFP_CFG(GPIO20, AF2)
-+#define GPIO20_SSP1_RXD		MFP_CFG(GPIO20, AF7)
-+#define GPIO35_SSP1_TXD		MFP_CFG(GPIO35, AF5)
-+#define GPIO35_SSP1_RXD		MFP_CFG(GPIO35, AF4)
-+#define GPIO36_SSP1_TXD		MFP_CFG(GPIO36, AF5)
-+#define GPIO36_SSP1_RXD		MFP_CFG(GPIO36, AF6)
-+#define GPIO87_SSP1_TXD		MFP_CFG(GPIO87, AF1)
-+#define GPIO87_SSP1_RXD		MFP_CFG(GPIO87, AF6)
-+#define GPIO88_SSP1_TXD		MFP_CFG(GPIO88, AF6)
-+#define GPIO88_SSP1_RXD		MFP_CFG(GPIO88, AF1)
-+
-+/* SSP2 */
-+#define GPIO29_SSP2_EXTCLK	MFP_CFG(GPIO29, AF2)
-+#define GPIO23_SSP2_SCLK	MFP_CFG(GPIO23, AF2)
-+#define GPIO17_SSP2_FRM		MFP_CFG(GPIO17, AF2)
-+#define GPIO25_SSP2_SCLK	MFP_CFG(GPIO25, AF2)
-+#define GPIO26_SSP2_FRM		MFP_CFG(GPIO26, AF2)
-+#define GPIO33_SSP2_SCLK	MFP_CFG(GPIO33, AF6)
-+#define GPIO34_SSP2_FRM		MFP_CFG(GPIO34, AF6)
-+#define GPIO64_SSP2_SCLK	MFP_CFG(GPIO64, AF2)
-+#define GPIO65_SSP2_FRM		MFP_CFG(GPIO65, AF2)
-+#define GPIO19_SSP2_TXD		MFP_CFG(GPIO19, AF2)
-+#define GPIO19_SSP2_RXD		MFP_CFG(GPIO19, AF7)
-+#define GPIO24_SSP2_TXD		MFP_CFG(GPIO24, AF5)
-+#define GPIO24_SSP2_RXD		MFP_CFG(GPIO24, AF4)
-+#define GPIO27_SSP2_TXD		MFP_CFG(GPIO27, AF2)
-+#define GPIO27_SSP2_RXD		MFP_CFG(GPIO27, AF5)
-+#define GPIO28_SSP2_TXD		MFP_CFG(GPIO28, AF5)
-+#define GPIO28_SSP2_RXD		MFP_CFG(GPIO28, AF2)
-+#define GPIO35_SSP2_TXD		MFP_CFG(GPIO35, AF7)
-+#define GPIO35_SSP2_RXD		MFP_CFG(GPIO35, AF6)
-+#define GPIO66_SSP2_TXD		MFP_CFG(GPIO66, AF4)
-+#define GPIO66_SSP2_RXD		MFP_CFG(GPIO66, AF2)
-+#define GPIO67_SSP2_TXD		MFP_CFG(GPIO67, AF2)
-+#define GPIO67_SSP2_RXD		MFP_CFG(GPIO67, AF4)
-+#define GPIO36_SSP2_TXD		MFP_CFG(GPIO36, AF7)
-+
-+/* SSP3 */
-+#define GPIO69_SSP3_FRM		MFP_CFG_X(GPIO69, AF2, DS08X, DRIVE_LOW)
-+#define GPIO68_SSP3_SCLK	MFP_CFG_X(GPIO68, AF2, DS08X, FLOAT)
-+#define GPIO92_SSP3_FRM		MFP_CFG_X(GPIO92, AF1, DS08X, DRIVE_LOW)
-+#define GPIO91_SSP3_SCLK	MFP_CFG_X(GPIO91, AF1, DS08X, FLOAT)
-+#define GPIO70_SSP3_TXD		MFP_CFG_X(GPIO70, AF2, DS08X, DRIVE_LOW)
-+#define GPIO70_SSP3_RXD		MFP_CFG_X(GPIO70, AF5, DS08X, FLOAT)
-+#define GPIO71_SSP3_TXD		MFP_CFG_X(GPIO71, AF5, DS08X, DRIVE_LOW)
-+#define GPIO71_SSP3_RXD		MFP_CFG_X(GPIO71, AF2, DS08X, FLOAT)
-+#define GPIO93_SSP3_TXD		MFP_CFG_X(GPIO93, AF1, DS08X, DRIVE_LOW)
-+#define GPIO93_SSP3_RXD		MFP_CFG_X(GPIO93, AF5, DS08X, FLOAT)
-+#define GPIO94_SSP3_TXD		MFP_CFG_X(GPIO94, AF5, DS08X, DRIVE_LOW)
-+#define GPIO94_SSP3_RXD		MFP_CFG_X(GPIO94, AF1, DS08X, FLOAT)
-+
-+/* SSP4 */
-+#define GPIO95_SSP4_SCLK	MFP_CFG_LPM(GPIO95, AF1, PULL_HIGH)
-+#define GPIO96_SSP4_FRM		MFP_CFG_LPM(GPIO96, AF1, PULL_HIGH)
-+#define GPIO97_SSP4_TXD		MFP_CFG_LPM(GPIO97, AF1, PULL_HIGH)
-+#define GPIO97_SSP4_RXD		MFP_CFG_LPM(GPIO97, AF5, PULL_HIGH)
-+#define GPIO98_SSP4_TXD		MFP_CFG_LPM(GPIO98, AF5, PULL_HIGH)
-+#define GPIO98_SSP4_RXD		MFP_CFG_LPM(GPIO98, AF1, PULL_HIGH)
-+
-+/* UART1 */
-+#define GPIO32_UART1_CTS	MFP_CFG_LPM(GPIO32,  AF2, FLOAT)
-+#define GPIO37_UART1_CTS	MFP_CFG_LPM(GPIO37,  AF4, FLOAT)
-+#define GPIO79_UART1_CTS	MFP_CFG_LPM(GPIO79,  AF1, FLOAT)
-+#define GPIO84_UART1_CTS	MFP_CFG_LPM(GPIO84,  AF3, FLOAT)
-+#define GPIO101_UART1_CTS	MFP_CFG_LPM(GPIO101, AF1, FLOAT)
-+#define GPIO106_UART1_CTS	MFP_CFG_LPM(GPIO106, AF6, FLOAT)
-+
-+#define GPIO32_UART1_RTS	MFP_CFG_LPM(GPIO32,  AF4, FLOAT)
-+#define GPIO37_UART1_RTS	MFP_CFG_LPM(GPIO37,  AF2, FLOAT)
-+#define GPIO79_UART1_RTS	MFP_CFG_LPM(GPIO79,  AF3, FLOAT)
-+#define GPIO84_UART1_RTS	MFP_CFG_LPM(GPIO84,  AF1, FLOAT)
-+#define GPIO101_UART1_RTS	MFP_CFG_LPM(GPIO101, AF6, FLOAT)
-+#define GPIO106_UART1_RTS	MFP_CFG_LPM(GPIO106, AF1, FLOAT)
-+
-+#define GPIO34_UART1_DSR	MFP_CFG_LPM(GPIO34,  AF2, FLOAT)
-+#define GPIO36_UART1_DSR	MFP_CFG_LPM(GPIO36,  AF4, FLOAT)
-+#define GPIO81_UART1_DSR	MFP_CFG_LPM(GPIO81,  AF1, FLOAT)
-+#define GPIO83_UART1_DSR	MFP_CFG_LPM(GPIO83,  AF3, FLOAT)
-+#define GPIO103_UART1_DSR	MFP_CFG_LPM(GPIO103, AF1, FLOAT)
-+#define GPIO105_UART1_DSR	MFP_CFG_LPM(GPIO105, AF6, FLOAT)
-+
-+#define GPIO34_UART1_DTR	MFP_CFG_LPM(GPIO34,  AF4, FLOAT)
-+#define GPIO36_UART1_DTR	MFP_CFG_LPM(GPIO36,  AF2, FLOAT)
-+#define GPIO81_UART1_DTR	MFP_CFG_LPM(GPIO81,  AF3, FLOAT)
-+#define GPIO83_UART1_DTR	MFP_CFG_LPM(GPIO83,  AF1, FLOAT)
-+#define GPIO103_UART1_DTR	MFP_CFG_LPM(GPIO103, AF6, FLOAT)
-+#define GPIO105_UART1_DTR	MFP_CFG_LPM(GPIO105, AF1, FLOAT)
-+
-+#define GPIO35_UART1_RI		MFP_CFG_LPM(GPIO35,  AF2, FLOAT)
-+#define GPIO82_UART1_RI		MFP_CFG_LPM(GPIO82,  AF1, FLOAT)
-+#define GPIO104_UART1_RI	MFP_CFG_LPM(GPIO104, AF1, FLOAT)
-+
-+#define GPIO33_UART1_DCD	MFP_CFG_LPM(GPIO33,  AF2, FLOAT)
-+#define GPIO80_UART1_DCD	MFP_CFG_LPM(GPIO80,  AF1, FLOAT)
-+#define GPIO102_UART1_DCD	MFP_CFG_LPM(GPIO102, AF1, FLOAT)
-+
-+#define GPIO30_UART1_RXD	MFP_CFG_LPM(GPIO30,  AF2, FLOAT)
-+#define GPIO31_UART1_RXD	MFP_CFG_LPM(GPIO31,  AF4, FLOAT)
-+#define GPIO77_UART1_RXD	MFP_CFG_LPM(GPIO77,  AF1, FLOAT)
-+#define GPIO78_UART1_RXD	MFP_CFG_LPM(GPIO78,  AF3, FLOAT)
-+#define GPIO99_UART1_RXD	MFP_CFG_LPM(GPIO99,  AF1, FLOAT)
-+#define GPIO100_UART1_RXD	MFP_CFG_LPM(GPIO100, AF6, FLOAT)
-+#define GPIO102_UART1_RXD	MFP_CFG_LPM(GPIO102, AF6, FLOAT)
-+#define GPIO104_UART1_RXD	MFP_CFG_LPM(GPIO104, AF4, FLOAT)
-+
-+#define GPIO30_UART1_TXD	MFP_CFG_LPM(GPIO30,  AF4, FLOAT)
-+#define GPIO31_UART1_TXD	MFP_CFG_LPM(GPIO31,  AF2, FLOAT)
-+#define GPIO77_UART1_TXD	MFP_CFG_LPM(GPIO77,  AF3, FLOAT)
-+#define GPIO78_UART1_TXD	MFP_CFG_LPM(GPIO78,  AF1, FLOAT)
-+#define GPIO99_UART1_TXD	MFP_CFG_LPM(GPIO99,  AF6, FLOAT)
-+#define GPIO100_UART1_TXD	MFP_CFG_LPM(GPIO100, AF1, FLOAT)
-+#define GPIO102_UART1_TXD	MFP_CFG_LPM(GPIO102, AF4, FLOAT)
-+
-+/* UART2 */
-+#define GPIO15_UART2_CTS	MFP_CFG_LPM(GPIO15,  AF3, FLOAT)
-+#define GPIO16_UART2_CTS	MFP_CFG_LPM(GPIO16,  AF5, FLOAT)
-+#define GPIO111_UART2_CTS	MFP_CFG_LPM(GPIO111, AF3, FLOAT)
-+#define GPIO114_UART2_CTS	MFP_CFG_LPM(GPIO114, AF1, FLOAT)
-+
-+#define GPIO15_UART2_RTS	MFP_CFG_LPM(GPIO15,  AF4, FLOAT)
-+#define GPIO16_UART2_RTS	MFP_CFG_LPM(GPIO16,  AF4, FLOAT)
-+#define GPIO114_UART2_RTS	MFP_CFG_LPM(GPIO114, AF3, FLOAT)
-+#define GPIO111_UART2_RTS	MFP_CFG_LPM(GPIO111, AF1, FLOAT)
-+
-+#define GPIO18_UART2_RXD	MFP_CFG_LPM(GPIO18,  AF5, FLOAT)
-+#define GPIO19_UART2_RXD	MFP_CFG_LPM(GPIO19,  AF4, FLOAT)
-+#define GPIO112_UART2_RXD	MFP_CFG_LPM(GPIO112, AF1, FLOAT)
-+#define GPIO113_UART2_RXD	MFP_CFG_LPM(GPIO113, AF3, FLOAT)
-+
-+#define GPIO18_UART2_TXD	MFP_CFG_LPM(GPIO18,  AF4, FLOAT)
-+#define GPIO19_UART2_TXD	MFP_CFG_LPM(GPIO19,  AF5, FLOAT)
-+#define GPIO112_UART2_TXD	MFP_CFG_LPM(GPIO112, AF3, FLOAT)
-+#define GPIO113_UART2_TXD	MFP_CFG_LPM(GPIO113, AF1, FLOAT)
-+
-+/* UART3 */
-+#define GPIO91_UART3_CTS	MFP_CFG_LPM(GPIO91,  AF2, FLOAT)
-+#define GPIO92_UART3_CTS	MFP_CFG_LPM(GPIO92,  AF4, FLOAT)
-+#define GPIO107_UART3_CTS	MFP_CFG_LPM(GPIO107, AF1, FLOAT)
-+#define GPIO108_UART3_CTS	MFP_CFG_LPM(GPIO108, AF3, FLOAT)
-+
-+#define GPIO91_UART3_RTS	MFP_CFG_LPM(GPIO91,  AF4, FLOAT)
-+#define GPIO92_UART3_RTS	MFP_CFG_LPM(GPIO92,  AF2, FLOAT)
-+#define GPIO107_UART3_RTS	MFP_CFG_LPM(GPIO107, AF3, FLOAT)
-+#define GPIO108_UART3_RTS	MFP_CFG_LPM(GPIO108, AF1, FLOAT)
-+
-+#define GPIO7_UART3_RXD		MFP_CFG_LPM(GPIO7,   AF2, FLOAT)
-+#define GPIO8_UART3_RXD		MFP_CFG_LPM(GPIO8,   AF6, FLOAT)
-+#define GPIO93_UART3_RXD	MFP_CFG_LPM(GPIO93,  AF4, FLOAT)
-+#define GPIO94_UART3_RXD	MFP_CFG_LPM(GPIO94,  AF2, FLOAT)
-+#define GPIO109_UART3_RXD	MFP_CFG_LPM(GPIO109, AF3, FLOAT)
-+#define GPIO110_UART3_RXD	MFP_CFG_LPM(GPIO110, AF1, FLOAT)
-+
-+#define GPIO7_UART3_TXD		MFP_CFG_LPM(GPIO7,   AF6, FLOAT)
-+#define GPIO8_UART3_TXD		MFP_CFG_LPM(GPIO8,   AF2, FLOAT)
-+#define GPIO93_UART3_TXD	MFP_CFG_LPM(GPIO93,  AF2, FLOAT)
-+#define GPIO94_UART3_TXD	MFP_CFG_LPM(GPIO94,  AF4, FLOAT)
-+#define GPIO109_UART3_TXD	MFP_CFG_LPM(GPIO109, AF1, FLOAT)
-+#define GPIO110_UART3_TXD	MFP_CFG_LPM(GPIO110, AF3, FLOAT)
-+
-+/* USB Host */
-+#define GPIO0_2_USBH_PEN	MFP_CFG(GPIO0_2, AF1)
-+#define GPIO1_2_USBH_PWR	MFP_CFG(GPIO1_2, AF1)
-+
-+/* USB P3 */
-+#define GPIO77_USB_P3_1		MFP_CFG(GPIO77,  AF2)
-+#define GPIO78_USB_P3_2		MFP_CFG(GPIO78,  AF2)
-+#define GPIO79_USB_P3_3		MFP_CFG(GPIO79,  AF2)
-+#define GPIO80_USB_P3_4		MFP_CFG(GPIO80,  AF2)
-+#define GPIO81_USB_P3_5		MFP_CFG(GPIO81,  AF2)
-+#define GPIO82_USB_P3_6		MFP_CFG(GPIO82,  AF2)
-+
-+/* PWM */
-+#define GPIO17_PWM0_OUT		MFP_CFG(GPIO17, AF1)
-+#define GPIO18_PWM1_OUT		MFP_CFG(GPIO18, AF1)
-+#define GPIO19_PWM2_OUT		MFP_CFG(GPIO19, AF1)
-+#define GPIO20_PWM3_OUT		MFP_CFG(GPIO20, AF1)
-+
-+/* CIR */
-+#define GPIO8_CIR_OUT		MFP_CFG(GPIO8, AF5)
-+#define GPIO16_CIR_OUT		MFP_CFG(GPIO16, AF3)
-+
-+#define GPIO20_OW_DQ_IN		MFP_CFG(GPIO20, AF5)
-+#define GPIO126_OW_DQ		MFP_CFG(GPIO126, AF2)
-+
-+#define GPIO0_DF_RDY		MFP_CFG(GPIO0, AF1)
-+#define GPIO7_CLK_BYPASS_XSC	MFP_CFG(GPIO7, AF7)
-+#define GPIO17_EXT_SYNC_MVT_0	MFP_CFG(GPIO17, AF6)
-+#define GPIO18_EXT_SYNC_MVT_1	MFP_CFG(GPIO18, AF6)
-+#define GPIO19_OST_CHOUT_MVT_0	MFP_CFG(GPIO19, AF6)
-+#define GPIO20_OST_CHOUT_MVT_1	MFP_CFG(GPIO20, AF6)
-+#define GPIO49_48M_CLK		MFP_CFG(GPIO49, AF2)
-+#define GPIO126_EXT_CLK		MFP_CFG(GPIO126, AF3)
-+#define GPIO127_CLK_BYPASS_GB	MFP_CFG(GPIO127, AF7)
-+#define GPIO71_EXT_MATCH_MVT	MFP_CFG(GPIO71, AF6)
-+
-+#define GPIO3_uIO_IN		MFP_CFG(GPIO3, AF1)
-+
-+#define GPIO4_uSIM_CARD_STATE	MFP_CFG(GPIO4, AF1)
-+#define GPIO5_uSIM_uCLK		MFP_CFG(GPIO5, AF1)
-+#define GPIO6_uSIM_uRST		MFP_CFG(GPIO6, AF1)
-+#define GPIO16_uSIM_UVS_0	MFP_CFG(GPIO16, AF1)
-+
-+#define GPIO9_SCIO		MFP_CFG(GPIO9, AF1)
-+#define GPIO20_RTC_MVT		MFP_CFG(GPIO20, AF4)
-+#define GPIO126_RTC_MVT		MFP_CFG(GPIO126, AF1)
-+
-+/*
-+ * PXA300 specific MFP configurations
-+ */
-+#ifdef CONFIG_CPU_PXA300
-+#define GPIO99_USB_P2_2		MFP_CFG(GPIO99, AF2)
-+#define GPIO99_USB_P2_5		MFP_CFG(GPIO99, AF3)
-+#define GPIO99_USB_P2_6		MFP_CFG(GPIO99, AF4)
-+#define GPIO100_USB_P2_2	MFP_CFG(GPIO100, AF4)
-+#define GPIO100_USB_P2_5	MFP_CFG(GPIO100, AF5)
-+#define GPIO101_USB_P2_1	MFP_CFG(GPIO101, AF2)
-+#define GPIO102_USB_P2_4	MFP_CFG(GPIO102, AF2)
-+#define GPIO104_USB_P2_3	MFP_CFG(GPIO104, AF2)
-+#define GPIO105_USB_P2_5	MFP_CFG(GPIO105, AF2)
-+#define GPIO100_USB_P2_6	MFP_CFG(GPIO100, AF2)
-+#define GPIO106_USB_P2_7	MFP_CFG(GPIO106, AF2)
-+#define GPIO103_USB_P2_8	MFP_CFG(GPIO103, AF2)
-+
-+/* U2D UTMI */
-+#define GPIO38_UTM_CLK		MFP_CFG(GPIO38,  AF1)
-+#define GPIO26_U2D_RXERROR	MFP_CFG(GPIO26,  AF3)
-+#define GPIO50_U2D_RXERROR	MFP_CFG(GPIO50,  AF1)
-+#define GPIO89_U2D_RXERROR	MFP_CFG(GPIO89,  AF5)
-+#define GPIO24_UTM_RXVALID	MFP_CFG(GPIO24,  AF3)
-+#define GPIO48_UTM_RXVALID	MFP_CFG(GPIO48,  AF2)
-+#define GPIO87_UTM_RXVALID	MFP_CFG(GPIO87,  AF5)
-+#define GPIO25_UTM_RXACTIVE	MFP_CFG(GPIO25,  AF3)
-+#define GPIO47_UTM_RXACTIVE	MFP_CFG(GPIO47,  AF2)
-+#define GPIO49_UTM_RXACTIVE	MFP_CFG(GPIO49,  AF1)
-+#define GPIO88_UTM_RXACTIVE	MFP_CFG(GPIO88,  AF5)
-+#define GPIO53_UTM_TXREADY	MFP_CFG(GPIO53,  AF1)
-+#define GPIO67_UTM_LINESTATE_0	MFP_CFG(GPIO67,  AF3)
-+#define GPIO92_UTM_LINESTATE_0	MFP_CFG(GPIO92,  AF3)
-+#define GPIO104_UTM_LINESTATE_0	MFP_CFG(GPIO104, AF3)
-+#define GPIO109_UTM_LINESTATE_0	MFP_CFG(GPIO109, AF4)
-+#define GPIO68_UTM_LINESTATE_1	MFP_CFG(GPIO68,  AF3)
-+#define GPIO93_UTM_LINESTATE_1	MFP_CFG(GPIO93,  AF3)
-+#define GPIO105_UTM_LINESTATE_1	MFP_CFG(GPIO105, AF3)
-+#define GPIO27_U2D_OPMODE_0	MFP_CFG(GPIO27,  AF4)
-+#define GPIO51_U2D_OPMODE_0	MFP_CFG(GPIO51,  AF2)
-+#define GPIO90_U2D_OPMODE_0	MFP_CFG(GPIO90,  AF7)
-+#define GPIO28_U2D_OPMODE_1	MFP_CFG(GPIO28,  AF4)
-+#define GPIO52_U2D_OPMODE_1	MFP_CFG(GPIO52,  AF2)
-+#define GPIO106_U2D_OPMODE_1	MFP_CFG(GPIO106, AF3)
-+#define GPIO110_U2D_OPMODE_1	MFP_CFG(GPIO110, AF5)
-+#define GPIO76_U2D_RESET	MFP_CFG(GPIO76,  AF1)
-+#define GPIO95_U2D_RESET	MFP_CFG(GPIO95,  AF2)
-+#define GPIO100_U2D_RESET	MFP_CFG(GPIO100, AF3)
-+#define GPIO66_U2D_SUSPEND	MFP_CFG(GPIO66,  AF3)
-+#define GPIO98_U2D_SUSPEND	MFP_CFG(GPIO98,  AF2)
-+#define GPIO103_U2D_SUSPEND	MFP_CFG(GPIO103, AF3)
-+#define GPIO65_U2D_TERM_SEL	MFP_CFG(GPIO65,  AF5)
-+#define GPIO97_U2D_TERM_SEL	MFP_CFG(GPIO97,  AF3)
-+#define GPIO102_U2D_TERM_SEL	MFP_CFG(GPIO102, AF5)
-+#define GPIO29_U2D_TXVALID	MFP_CFG(GPIO29,  AF3)
-+#define GPIO52_U2D_TXVALID	MFP_CFG(GPIO52,  AF4)
-+#define GPIO69_U2D_TXVALID	MFP_CFG(GPIO69,  AF3)
-+#define GPIO85_U2D_TXVALID	MFP_CFG(GPIO85,  AF7)
-+#define GPIO64_U2D_XCVR_SEL	MFP_CFG(GPIO64,  AF5)
-+#define GPIO96_U2D_XCVR_SEL	MFP_CFG(GPIO96,  AF3)
-+#define GPIO101_U2D_XCVR_SEL	MFP_CFG(GPIO101, AF5)
-+#define GPIO30_UTM_PHYDATA_0	MFP_CFG(GPIO30,  AF3)
-+#define GPIO31_UTM_PHYDATA_1	MFP_CFG(GPIO31,  AF3)
-+#define GPIO32_UTM_PHYDATA_2	MFP_CFG(GPIO32,  AF3)
-+#define GPIO33_UTM_PHYDATA_3	MFP_CFG(GPIO33,  AF3)
-+#define GPIO34_UTM_PHYDATA_4	MFP_CFG(GPIO34,  AF3)
-+#define GPIO35_UTM_PHYDATA_5	MFP_CFG(GPIO35,  AF3)
-+#define GPIO36_UTM_PHYDATA_6	MFP_CFG(GPIO36,  AF3)
-+#define GPIO37_UTM_PHYDATA_7	MFP_CFG(GPIO37,  AF3)
-+#define GPIO39_UTM_PHYDATA_0	MFP_CFG(GPIO39,  AF3)
-+#define GPIO40_UTM_PHYDATA_1	MFP_CFG(GPIO40,  AF3)
-+#define GPIO41_UTM_PHYDATA_2	MFP_CFG(GPIO41,  AF3)
-+#define GPIO42_UTM_PHYDATA_3	MFP_CFG(GPIO42,  AF3)
-+#define GPIO43_UTM_PHYDATA_4	MFP_CFG(GPIO43,  AF3)
-+#define GPIO44_UTM_PHYDATA_5	MFP_CFG(GPIO44,  AF3)
-+#define GPIO45_UTM_PHYDATA_6	MFP_CFG(GPIO45,  AF3)
-+#define GPIO46_UTM_PHYDATA_7	MFP_CFG(GPIO46,  AF3)
-+#endif /* CONFIG_CPU_PXA300 */
-+
-+/*
-+ * PXA310 specific MFP configurations
-+ */
-+#ifdef CONFIG_CPU_PXA310
-+/* USB P2 */
-+#define GPIO36_USB_P2_1		MFP_CFG(GPIO36, AF1)
-+#define GPIO30_USB_P2_2		MFP_CFG(GPIO30, AF1)
-+#define GPIO35_USB_P2_3		MFP_CFG(GPIO35, AF1)
-+#define GPIO32_USB_P2_4		MFP_CFG(GPIO32, AF1)
-+#define GPIO34_USB_P2_5		MFP_CFG(GPIO34, AF1)
-+#define GPIO31_USB_P2_6		MFP_CFG(GPIO31, AF1)
-+
-+/* MMC1 */
-+#define GPIO24_MMC1_CMD		MFP_CFG(GPIO24, AF3)
-+#define GPIO29_MMC1_DAT0	MFP_CFG(GPIO29, AF3)
-+
-+/* MMC3 */
-+#define GPIO103_MMC3_CLK	MFP_CFG(GPIO103, AF2)
-+#define GPIO105_MMC3_CMD	MFP_CFG(GPIO105, AF2)
-+#define GPIO11_2_MMC3_CLK	MFP_CFG(GPIO11_2, AF1)
-+#define GPIO12_2_MMC3_CMD	MFP_CFG(GPIO12_2, AF1)
-+#define GPIO7_2_MMC3_DAT0	MFP_CFG(GPIO7_2, AF1)
-+#define GPIO8_2_MMC3_DAT1	MFP_CFG(GPIO8_2, AF1)
-+#define GPIO9_2_MMC3_DAT2	MFP_CFG(GPIO9_2, AF1)
-+#define GPIO10_2_MMC3_DAT3	MFP_CFG(GPIO10_2, AF1)
-+
-+/* ULPI */
-+#define GPIO38_ULPI_CLK		MFP_CFG(GPIO38, AF1)
-+#define GPIO30_ULPI_DATA_OUT_0	MFP_CFG(GPIO30, AF3)
-+#define GPIO31_ULPI_DATA_OUT_1	MFP_CFG(GPIO31, AF3)
-+#define GPIO32_ULPI_DATA_OUT_2	MFP_CFG(GPIO32, AF3)
-+#define GPIO33_ULPI_DATA_OUT_3	MFP_CFG(GPIO33, AF3)
-+#define GPIO34_ULPI_DATA_OUT_4	MFP_CFG(GPIO34, AF3)
-+#define GPIO35_ULPI_DATA_OUT_5	MFP_CFG(GPIO35, AF3)
-+#define GPIO36_ULPI_DATA_OUT_6	MFP_CFG(GPIO36, AF3)
-+#define GPIO37_ULPI_DATA_OUT_7	MFP_CFG(GPIO37, AF3)
-+#define GPIO33_ULPI_OTG_INTR	MFP_CFG(GPIO33, AF1)
-+
-+#define ULPI_DIR	MFP_CFG_DRV(ULPI_DIR, MFP_AF0, MFP_DS01X)
-+#define ULPI_NXT	MFP_CFG_DRV(ULPI_NXT, MFP_AF0, MFP_DS01X)
-+#define ULPI_STP	MFP_CFG_DRV(ULPI_STP, MFP_AF0, MFP_DS01X)
-+#endif /* CONFIG_CPU_PXA310 */
-+
-+#endif /* __ASM_ARCH_MFP_PXA300_H */
---- /dev/null
-+++ linux-2.6.23/include/asm-arm/arch-pxa/mfp-pxa320.h
-@@ -0,0 +1,446 @@
-+/*
-+ * linux/include/asm-arm/arch-pxa/mfp-pxa320.h
-+ *
-+ * PXA320 specific MFP configuration definitions
-+ *
-+ * Copyright (C) 2007 Marvell International Ltd.
-+ * 2007-08-21: eric miao <eric.y.miao@gmail.com>
-+ *             initial version
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License version 2 as
-+ *  published by the Free Software Foundation.
-+ */
-+
-+#ifndef __ASM_ARCH_MFP_PXA320_H
-+#define __ASM_ARCH_MFP_PXA320_H
-+
-+#include <asm/arch/mfp.h>
-+
-+/* GPIO */
-+#define GPIO46_GPIO		MFP_CFG(GPIO6, AF0)
-+#define GPIO49_GPIO		MFP_CFG(GPIO49, AF0)
-+#define GPIO50_GPIO		MFP_CFG(GPIO50, AF0)
-+#define GPIO51_GPIO		MFP_CFG(GPIO51, AF0)
-+#define GPIO52_GPIO		MFP_CFG(GPIO52, AF0)
-+
-+#define GPIO7_2_GPIO		MFP_CFG(GPIO7_2, AF0)
-+#define GPIO8_2_GPIO		MFP_CFG(GPIO8_2, AF0)
-+#define GPIO9_2_GPIO		MFP_CFG(GPIO9_2, AF0)
-+#define GPIO10_2_GPIO		MFP_CFG(GPIO10_2, AF0)
-+#define GPIO11_2_GPIO		MFP_CFG(GPIO11_2, AF0)
-+#define GPIO12_2_GPIO		MFP_CFG(GPIO12_2, AF0)
-+#define GPIO13_2_GPIO		MFP_CFG(GPIO13_2, AF0)
-+#define GPIO14_2_GPIO		MFP_CFG(GPIO14_2, AF0)
-+#define GPIO15_2_GPIO		MFP_CFG(GPIO15_2, AF0)
-+#define GPIO16_2_GPIO		MFP_CFG(GPIO16_2, AF0)
-+#define GPIO17_2_GPIO		MFP_CFG(GPIO17_2, AF0)
-+
-+/* Chip Select */
-+#define GPIO4_nCS3		MFP_CFG(GPIO4, AF1)
-+
-+/* AC97 */
-+#define GPIO34_AC97_SYSCLK	MFP_CFG(GPIO34, AF1)
-+#define GPIO39_AC97_BITCLK	MFP_CFG(GPIO39, AF1)
-+#define GPIO40_AC97_nACRESET	MFP_CFG(GPIO40, AF1)
-+#define GPIO35_AC97_SDATA_IN_0	MFP_CFG(GPIO35, AF1)
-+#define GPIO36_AC97_SDATA_IN_1	MFP_CFG(GPIO36, AF1)
-+#define GPIO32_AC97_SDATA_IN_2	MFP_CFG(GPIO32, AF2)
-+#define GPIO33_AC97_SDATA_IN_3	MFP_CFG(GPIO33, AF2)
-+#define GPIO11_AC97_SDATA_IN_2	MFP_CFG(GPIO11, AF3)
-+#define GPIO12_AC97_SDATA_IN_3	MFP_CFG(GPIO12, AF3)
-+#define GPIO37_AC97_SDATA_OUT	MFP_CFG(GPIO37, AF1)
-+#define GPIO38_AC97_SYNC	MFP_CFG(GPIO38, AF1)
-+
-+/* I2C */
-+#define GPIO32_I2C_SCL		MFP_CFG_LPM(GPIO32, AF1, PULL_HIGH)
-+#define GPIO33_I2C_SDA		MFP_CFG_LPM(GPIO33, AF1, PULL_HIGH)
-+
-+/* QCI */
-+#define GPIO49_CI_DD_0		MFP_CFG_DRV(GPIO49, AF1, DS04X)
-+#define GPIO50_CI_DD_1		MFP_CFG_DRV(GPIO50, AF1, DS04X)
-+#define GPIO51_CI_DD_2		MFP_CFG_DRV(GPIO51, AF1, DS04X)
-+#define GPIO52_CI_DD_3		MFP_CFG_DRV(GPIO52, AF1, DS04X)
-+#define GPIO53_CI_DD_4		MFP_CFG_DRV(GPIO53, AF1, DS04X)
-+#define GPIO54_CI_DD_5		MFP_CFG_DRV(GPIO54, AF1, DS04X)
-+#define GPIO55_CI_DD_6		MFP_CFG_DRV(GPIO55, AF1, DS04X)
-+#define GPIO56_CI_DD_7		MFP_CFG_DRV(GPIO56, AF0, DS04X)
-+#define GPIO57_CI_DD_8		MFP_CFG_DRV(GPIO57, AF1, DS04X)
-+#define GPIO58_CI_DD_9		MFP_CFG_DRV(GPIO58, AF1, DS04X)
-+#define GPIO59_CI_MCLK		MFP_CFG_DRV(GPIO59, AF0, DS04X)
-+#define GPIO60_CI_PCLK		MFP_CFG_DRV(GPIO60, AF0, DS04X)
-+#define GPIO61_CI_HSYNC		MFP_CFG_DRV(GPIO61, AF0, DS04X)
-+#define GPIO62_CI_VSYNC		MFP_CFG_DRV(GPIO62, AF0, DS04X)
-+
-+#define GPIO31_CIR_OUT		MFP_CFG(GPIO31, AF5)
-+
-+#define GPIO0_2_CLK_EXT		MFP_CFG(GPIO0_2, AF3)
-+#define GPIO0_DRQ		MFP_CFG(GPIO0, AF2)
-+#define GPIO11_EXT_SYNC0	MFP_CFG(GPIO11, AF5)
-+#define GPIO12_EXT_SYNC1	MFP_CFG(GPIO12, AF6)
-+#define GPIO0_2_HZ_CLK		MFP_CFG(GPIO0_2, AF1)
-+#define GPIO14_HZ_CLK		MFP_CFG(GPIO14, AF4)
-+#define GPIO30_ICP_RXD		MFP_CFG(GPIO30, AF1)
-+#define GPIO31_ICP_TXD		MFP_CFG(GPIO31, AF1)
-+
-+#define GPIO83_KP_DKIN_0	MFP_CFG_LPM(GPIO83, AF3, FLOAT)
-+#define GPIO84_KP_DKIN_1	MFP_CFG_LPM(GPIO84, AF3, FLOAT)
-+#define GPIO85_KP_DKIN_2	MFP_CFG_LPM(GPIO85, AF3, FLOAT)
-+#define GPIO86_KP_DKIN_3	MFP_CFG_LPM(GPIO86, AF3, FLOAT)
-+
-+#define GPIO105_KP_DKIN_0	MFP_CFG_LPM(GPIO105, AF2, FLOAT)
-+#define GPIO106_KP_DKIN_1	MFP_CFG_LPM(GPIO106, AF2, FLOAT)
-+#define GPIO107_KP_DKIN_2	MFP_CFG_LPM(GPIO107, AF2, FLOAT)
-+#define GPIO108_KP_DKIN_3	MFP_CFG_LPM(GPIO108, AF2, FLOAT)
-+#define GPIO109_KP_DKIN_4	MFP_CFG_LPM(GPIO109, AF2, FLOAT)
-+#define GPIO110_KP_DKIN_5	MFP_CFG_LPM(GPIO110, AF2, FLOAT)
-+#define GPIO111_KP_DKIN_6	MFP_CFG_LPM(GPIO111, AF2, FLOAT)
-+#define GPIO112_KP_DKIN_7	MFP_CFG_LPM(GPIO112, AF2, FLOAT)
-+
-+#define GPIO113_KP_DKIN_0	MFP_CFG_LPM(GPIO113, AF2, FLOAT)
-+#define GPIO114_KP_DKIN_1	MFP_CFG_LPM(GPIO114, AF2, FLOAT)
-+#define GPIO115_KP_DKIN_2	MFP_CFG_LPM(GPIO115, AF2, FLOAT)
-+#define GPIO116_KP_DKIN_3	MFP_CFG_LPM(GPIO116, AF2, FLOAT)
-+#define GPIO117_KP_DKIN_4	MFP_CFG_LPM(GPIO117, AF2, FLOAT)
-+#define GPIO118_KP_DKIN_5	MFP_CFG_LPM(GPIO118, AF2, FLOAT)
-+#define GPIO119_KP_DKIN_6	MFP_CFG_LPM(GPIO119, AF2, FLOAT)
-+#define GPIO120_KP_DKIN_7	MFP_CFG_LPM(GPIO120, AF2, FLOAT)
-+
-+#define GPIO127_KP_DKIN_0	MFP_CFG_LPM(GPIO127, AF2, FLOAT)
-+#define GPIO126_KP_DKIN_1	MFP_CFG_LPM(GPIO126, AF2, FLOAT)
-+
-+#define GPIO2_2_KP_DKIN_0	MFP_CFG_LPM(GPIO2_2, AF2, FLOAT)
-+#define GPIO3_2_KP_DKIN_1	MFP_CFG_LPM(GPIO3_2, AF2, FLOAT)
-+#define GPIO125_KP_DKIN_2	MFP_CFG_LPM(GPIO125, AF2, FLOAT)
-+#define GPIO124_KP_DKIN_3	MFP_CFG_LPM(GPIO124, AF2, FLOAT)
-+#define GPIO123_KP_DKIN_4	MFP_CFG_LPM(GPIO123, AF2, FLOAT)
-+#define GPIO122_KP_DKIN_5	MFP_CFG_LPM(GPIO122, AF2, FLOAT)
-+#define GPIO121_KP_DKIN_6	MFP_CFG_LPM(GPIO121, AF2, FLOAT)
-+#define GPIO4_2_KP_DKIN_7	MFP_CFG_LPM(GPIO4_2, AF2, FLOAT)
-+
-+#define GPIO113_KP_MKIN_0	MFP_CFG_LPM(GPIO113, AF1, FLOAT)
-+#define GPIO114_KP_MKIN_1	MFP_CFG_LPM(GPIO114, AF1, FLOAT)
-+#define GPIO115_KP_MKIN_2	MFP_CFG_LPM(GPIO115, AF1, FLOAT)
-+#define GPIO116_KP_MKIN_3	MFP_CFG_LPM(GPIO116, AF1, FLOAT)
-+#define GPIO117_KP_MKIN_4	MFP_CFG_LPM(GPIO117, AF1, FLOAT)
-+#define GPIO118_KP_MKIN_5	MFP_CFG_LPM(GPIO118, AF1, FLOAT)
-+#define GPIO119_KP_MKIN_6	MFP_CFG_LPM(GPIO119, AF1, FLOAT)
-+#define GPIO120_KP_MKIN_7	MFP_CFG_LPM(GPIO120, AF1, FLOAT)
-+
-+#define GPIO83_KP_MKOUT_0	MFP_CFG_LPM(GPIO83, AF2, DRIVE_HIGH)
-+#define GPIO84_KP_MKOUT_1	MFP_CFG_LPM(GPIO84, AF2, DRIVE_HIGH)
-+#define GPIO85_KP_MKOUT_2	MFP_CFG_LPM(GPIO85, AF2, DRIVE_HIGH)
-+#define GPIO86_KP_MKOUT_3	MFP_CFG_LPM(GPIO86, AF2, DRIVE_HIGH)
-+#define GPIO13_KP_MKOUT_4	MFP_CFG_LPM(GPIO13, AF3, DRIVE_HIGH)
-+#define GPIO14_KP_MKOUT_5	MFP_CFG_LPM(GPIO14, AF3, DRIVE_HIGH)
-+
-+#define GPIO121_KP_MKOUT_0	MFP_CFG_LPM(GPIO121, AF1, DRIVE_HIGH)
-+#define GPIO122_KP_MKOUT_1	MFP_CFG_LPM(GPIO122, AF1, DRIVE_HIGH)
-+#define GPIO123_KP_MKOUT_2	MFP_CFG_LPM(GPIO123, AF1, DRIVE_HIGH)
-+#define GPIO124_KP_MKOUT_3	MFP_CFG_LPM(GPIO124, AF1, DRIVE_HIGH)
-+#define GPIO125_KP_MKOUT_4	MFP_CFG_LPM(GPIO125, AF1, DRIVE_HIGH)
-+#define GPIO126_KP_MKOUT_5	MFP_CFG_LPM(GPIO126, AF1, DRIVE_HIGH)
-+#define GPIO127_KP_MKOUT_6	MFP_CFG_LPM(GPIO127, AF1, DRIVE_HIGH)
-+#define GPIO5_2_KP_MKOUT_7	MFP_CFG_LPM(GPIO5_2, AF1, DRIVE_HIGH)
-+
-+/* LCD */
-+#define GPIO6_2_LCD_LDD_0	MFP_CFG_DRV(GPIO6_2, AF1, DS01X)
-+#define GPIO7_2_LCD_LDD_1	MFP_CFG_DRV(GPIO7_2, AF1, DS01X)
-+#define GPIO8_2_LCD_LDD_2	MFP_CFG_DRV(GPIO8_2, AF1, DS01X)
-+#define GPIO9_2_LCD_LDD_3	MFP_CFG_DRV(GPIO9_2, AF1, DS01X)
-+#define GPIO10_2_LCD_LDD_4	MFP_CFG_DRV(GPIO10_2, AF1, DS01X)
-+#define GPIO11_2_LCD_LDD_5	MFP_CFG_DRV(GPIO11_2, AF1, DS01X)
-+#define GPIO12_2_LCD_LDD_6	MFP_CFG_DRV(GPIO12_2, AF1, DS01X)
-+#define GPIO13_2_LCD_LDD_7	MFP_CFG_DRV(GPIO13_2, AF1, DS01X)
-+#define GPIO63_LCD_LDD_8	MFP_CFG_DRV(GPIO63, AF1, DS01X)
-+#define GPIO64_LCD_LDD_9	MFP_CFG_DRV(GPIO64, AF1, DS01X)
-+#define GPIO65_LCD_LDD_10	MFP_CFG_DRV(GPIO65, AF1, DS01X)
-+#define GPIO66_LCD_LDD_11	MFP_CFG_DRV(GPIO66, AF1, DS01X)
-+#define GPIO67_LCD_LDD_12	MFP_CFG_DRV(GPIO67, AF1, DS01X)
-+#define GPIO68_LCD_LDD_13	MFP_CFG_DRV(GPIO68, AF1, DS01X)
-+#define GPIO69_LCD_LDD_14	MFP_CFG_DRV(GPIO69, AF1, DS01X)
-+#define GPIO70_LCD_LDD_15	MFP_CFG_DRV(GPIO70, AF1, DS01X)
-+#define GPIO71_LCD_LDD_16	MFP_CFG_DRV(GPIO71, AF1, DS01X)
-+#define GPIO72_LCD_LDD_17	MFP_CFG_DRV(GPIO72, AF1, DS01X)
-+#define GPIO73_LCD_CS_N		MFP_CFG_DRV(GPIO73, AF2, DS01X)
-+#define GPIO74_LCD_VSYNC	MFP_CFG_DRV(GPIO74, AF2, DS01X)
-+#define GPIO14_2_LCD_FCLK	MFP_CFG_DRV(GPIO14_2, AF1, DS01X)
-+#define GPIO15_2_LCD_LCLK	MFP_CFG_DRV(GPIO15_2, AF1, DS01X)
-+#define GPIO16_2_LCD_PCLK	MFP_CFG_DRV(GPIO16_2, AF1, DS01X)
-+#define GPIO17_2_LCD_BIAS	MFP_CFG_DRV(GPIO17_2, AF1, DS01X)
-+#define GPIO64_LCD_VSYNC	MFP_CFG_DRV(GPIO64, AF2, DS01X)
-+#define GPIO63_LCD_CS_N		MFP_CFG_DRV(GPIO63, AF2, DS01X)
-+
-+#define GPIO6_2_MLCD_DD_0	MFP_CFG_DRV(GPIO6_2, AF7, DS08X)
-+#define GPIO7_2_MLCD_DD_1	MFP_CFG_DRV(GPIO7_2, AF7, DS08X)
-+#define GPIO8_2_MLCD_DD_2	MFP_CFG_DRV(GPIO8_2, AF7, DS08X)
-+#define GPIO9_2_MLCD_DD_3	MFP_CFG_DRV(GPIO9_2, AF7, DS08X)
-+#define GPIO10_2_MLCD_DD_4	MFP_CFG_DRV(GPIO10_2, AF7, DS08X)
-+#define GPIO11_2_MLCD_DD_5	MFP_CFG_DRV(GPIO11_2, AF7, DS08X)
-+#define GPIO12_2_MLCD_DD_6	MFP_CFG_DRV(GPIO12_2, AF7, DS08X)
-+#define GPIO13_2_MLCD_DD_7	MFP_CFG_DRV(GPIO13_2, AF7, DS08X)
-+#define GPIO63_MLCD_DD_8	MFP_CFG_DRV(GPIO63, AF7, DS08X)
-+#define GPIO64_MLCD_DD_9	MFP_CFG_DRV(GPIO64, AF7, DS08X)
-+#define GPIO65_MLCD_DD_10	MFP_CFG_DRV(GPIO65, AF7, DS08X)
-+#define GPIO66_MLCD_DD_11	MFP_CFG_DRV(GPIO66, AF7, DS08X)
-+#define GPIO67_MLCD_DD_12	MFP_CFG_DRV(GPIO67, AF7, DS08X)
-+#define GPIO68_MLCD_DD_13	MFP_CFG_DRV(GPIO68, AF7, DS08X)
-+#define GPIO69_MLCD_DD_14	MFP_CFG_DRV(GPIO69, AF7, DS08X)
-+#define GPIO70_MLCD_DD_15	MFP_CFG_DRV(GPIO70, AF7, DS08X)
-+#define GPIO71_MLCD_DD_16	MFP_CFG_DRV(GPIO71, AF7, DS08X)
-+#define GPIO72_MLCD_DD_17	MFP_CFG_DRV(GPIO72, AF7, DS08X)
-+#define GPIO73_MLCD_CS		MFP_CFG_DRV(GPIO73, AF7, DS08X)
-+#define GPIO74_MLCD_VSYNC	MFP_CFG_DRV(GPIO74, AF7, DS08X)
-+#define GPIO14_2_MLCD_FCLK	MFP_CFG_DRV(GPIO14_2, AF7, DS08X)
-+#define GPIO15_2_MLCD_LCLK	MFP_CFG_DRV(GPIO15_2, AF7, DS08X)
-+#define GPIO16_2_MLCD_PCLK	MFP_CFG_DRV(GPIO16_2, AF7, DS08X)
-+#define GPIO17_2_MLCD_BIAS	MFP_CFG_DRV(GPIO17_2, AF7, DS08X)
-+
-+/* MMC1 */
-+#define GPIO9_MMC1_CMD		MFP_CFG_LPM(GPIO9,  AF4, DRIVE_HIGH)
-+#define GPIO22_MMC1_CLK		MFP_CFG_LPM(GPIO22, AF4, DRIVE_HIGH)
-+#define GPIO23_MMC1_CMD		MFP_CFG_LPM(GPIO23, AF4, DRIVE_HIGH)
-+#define GPIO30_MMC1_CLK		MFP_CFG_LPM(GPIO30, AF4, DRIVE_HIGH)
-+#define GPIO31_MMC1_CMD		MFP_CFG_LPM(GPIO31, AF4, DRIVE_HIGH)
-+#define GPIO5_MMC1_DAT0		MFP_CFG_LPM(GPIO5,  AF4, DRIVE_HIGH)
-+#define GPIO6_MMC1_DAT1		MFP_CFG_LPM(GPIO6,  AF4, DRIVE_HIGH)
-+#define GPIO7_MMC1_DAT2		MFP_CFG_LPM(GPIO7,  AF4, DRIVE_HIGH)
-+#define GPIO8_MMC1_DAT3		MFP_CFG_LPM(GPIO8,  AF4, DRIVE_HIGH)
-+#define GPIO18_MMC1_DAT0	MFP_CFG_LPM(GPIO18, AF4, DRIVE_HIGH)
-+#define GPIO19_MMC1_DAT1	MFP_CFG_LPM(GPIO19, AF4, DRIVE_HIGH)
-+#define GPIO20_MMC1_DAT2	MFP_CFG_LPM(GPIO20, AF4, DRIVE_HIGH)
-+#define GPIO21_MMC1_DAT3	MFP_CFG_LPM(GPIO21, AF4, DRIVE_HIGH)
-+
-+#define GPIO28_MMC2_CLK		MFP_CFG_LPM(GPIO28, AF4, PULL_HIGH)
-+#define GPIO29_MMC2_CMD		MFP_CFG_LPM(GPIO29, AF4, PULL_HIGH)
-+#define GPIO30_MMC2_CLK		MFP_CFG_LPM(GPIO30, AF3, PULL_HIGH)
-+#define GPIO31_MMC2_CMD		MFP_CFG_LPM(GPIO31, AF3, PULL_HIGH)
-+#define GPIO79_MMC2_CLK		MFP_CFG_LPM(GPIO79, AF4, PULL_HIGH)
-+#define GPIO80_MMC2_CMD		MFP_CFG_LPM(GPIO80, AF4, PULL_HIGH)
-+
-+#define GPIO5_MMC2_DAT0		MFP_CFG_LPM(GPIO5, AF2, PULL_HIGH)
-+#define GPIO6_MMC2_DAT1		MFP_CFG_LPM(GPIO6, AF2, PULL_HIGH)
-+#define GPIO7_MMC2_DAT2		MFP_CFG_LPM(GPIO7, AF2, PULL_HIGH)
-+#define GPIO8_MMC2_DAT3		MFP_CFG_LPM(GPIO8, AF2, PULL_HIGH)
-+#define GPIO24_MMC2_DAT0	MFP_CFG_LPM(GPIO24, AF4, PULL_HIGH)
-+#define GPIO75_MMC2_DAT0	MFP_CFG_LPM(GPIO75, AF4, PULL_HIGH)
-+#define GPIO25_MMC2_DAT1	MFP_CFG_LPM(GPIO25, AF4, PULL_HIGH)
-+#define GPIO76_MMC2_DAT1	MFP_CFG_LPM(GPIO76, AF4, PULL_HIGH)
-+#define GPIO26_MMC2_DAT2	MFP_CFG_LPM(GPIO26, AF4, PULL_HIGH)
-+#define GPIO77_MMC2_DAT2	MFP_CFG_LPM(GPIO77, AF4, PULL_HIGH)
-+#define GPIO27_MMC2_DAT3	MFP_CFG_LPM(GPIO27, AF4, PULL_HIGH)
-+#define GPIO78_MMC2_DAT3	MFP_CFG_LPM(GPIO78, AF4, PULL_HIGH)
-+
-+/* 1-Wire */
-+#define GPIO14_ONE_WIRE		MFP_CFG_LPM(GPIO14,  AF5, FLOAT)
-+#define GPIO0_2_ONE_WIRE	MFP_CFG_LPM(GPIO0_2, AF2, FLOAT)
-+
-+/* SSP1 */
-+#define GPIO87_SSP1_EXTCLK	MFP_CFG(GPIO87, AF1)
-+#define GPIO88_SSP1_SYSCLK	MFP_CFG(GPIO88, AF1)
-+#define GPIO83_SSP1_SCLK	MFP_CFG(GPIO83, AF1)
-+#define GPIO84_SSP1_SFRM	MFP_CFG(GPIO84, AF1)
-+#define GPIO85_SSP1_RXD		MFP_CFG(GPIO85, AF6)
-+#define GPIO85_SSP1_TXD		MFP_CFG(GPIO85, AF1)
-+#define GPIO86_SSP1_RXD		MFP_CFG(GPIO86, AF1)
-+#define GPIO86_SSP1_TXD		MFP_CFG(GPIO86, AF6)
-+
-+/* SSP2 */
-+#define GPIO39_SSP2_EXTCLK	MFP_CFG(GPIO39, AF2)
-+#define GPIO40_SSP2_SYSCLK	MFP_CFG(GPIO40, AF2)
-+#define GPIO12_SSP2_SCLK	MFP_CFG(GPIO12, AF2)
-+#define GPIO35_SSP2_SCLK	MFP_CFG(GPIO35, AF2)
-+#define GPIO36_SSP2_SFRM	MFP_CFG(GPIO36, AF2)
-+#define GPIO37_SSP2_RXD		MFP_CFG(GPIO37, AF5)
-+#define GPIO37_SSP2_TXD		MFP_CFG(GPIO37, AF2)
-+#define GPIO38_SSP2_RXD		MFP_CFG(GPIO38, AF2)
-+#define GPIO38_SSP2_TXD		MFP_CFG(GPIO38, AF5)
-+
-+#define GPIO69_SSP3_SCLK	MFP_CFG(GPIO69, AF2, DS08X, FLOAT)
-+#define GPIO70_SSP3_FRM		MFP_CFG(GPIO70, AF2, DS08X, DRIVE_LOW)
-+#define GPIO89_SSP3_SCLK	MFP_CFG(GPIO89, AF1, DS08X, FLOAT)
-+#define GPIO90_SSP3_FRM		MFP_CFG(GPIO90, AF1, DS08X, DRIVE_LOW)
-+#define GPIO71_SSP3_RXD		MFP_CFG_X(GPIO71, AF5, DS08X, FLOAT)
-+#define GPIO71_SSP3_TXD		MFP_CFG_X(GPIO71, AF2, DS08X, DRIVE_LOW)
-+#define GPIO72_SSP3_RXD		MFP_CFG_X(GPIO72, AF2, DS08X, FLOAT)
-+#define GPIO72_SSP3_TXD		MFP_CFG_X(GPIO72, AF5, DS08X, DRIVE_LOW)
-+#define GPIO91_SSP3_RXD		MFP_CFG_X(GPIO91, AF5, DS08X, FLOAT)
-+#define GPIO91_SSP3_TXD		MFP_CFG_X(GPIO91, AF1, DS08X, DRIVE_LOW)
-+#define GPIO92_SSP3_RXD		MFP_CFG_X(GPIO92, AF1, DS08X, FLOAT)
-+#define GPIO92_SSP3_TXD		MFP_CFG_X(GPIO92, AF5, DS08X, DRIVE_LOW)
-+
-+#define GPIO93_SSP4_SCLK	MFP_CFG_LPM(GPIO93, AF1, PULL_HIGH)
-+#define GPIO94_SSP4_FRM		MFP_CFG_LPM(GPIO94, AF1, PULL_HIGH)
-+#define GPIO94_SSP4_RXD		MFP_CFG_LPM(GPIO94, AF5, PULL_HIGH)
-+#define GPIO95_SSP4_RXD		MFP_CFG_LPM(GPIO95, AF5, PULL_HIGH)
-+#define GPIO95_SSP4_TXD		MFP_CFG_LPM(GPIO95, AF1, PULL_HIGH)
-+#define GPIO96_SSP4_RXD		MFP_CFG_LPM(GPIO96, AF1, PULL_HIGH)
-+#define GPIO96_SSP4_TXD		MFP_CFG_LPM(GPIO96, AF5, PULL_HIGH)
-+
-+/* UART1 */
-+#define GPIO41_UART1_RXD	MFP_CFG_LPM(GPIO41, AF2, FLOAT)
-+#define GPIO41_UART1_TXD	MFP_CFG_LPM(GPIO41, AF4, FLOAT)
-+#define GPIO42_UART1_RXD	MFP_CFG_LPM(GPIO42, AF4, FLOAT)
-+#define GPIO42_UART1_TXD	MFP_CFG_LPM(GPIO42, AF2, FLOAT)
-+#define GPIO97_UART1_RXD	MFP_CFG_LPM(GPIO97, AF1, FLOAT)
-+#define GPIO97_UART1_TXD	MFP_CFG_LPM(GPIO97, AF6, FLOAT)
-+#define GPIO98_UART1_RXD	MFP_CFG_LPM(GPIO98, AF6, FLOAT)
-+#define GPIO98_UART1_TXD	MFP_CFG_LPM(GPIO98, AF1, FLOAT)
-+#define GPIO43_UART1_CTS	MFP_CFG_LPM(GPIO43, AF2, FLOAT)
-+#define GPIO43_UART1_RTS	MFP_CFG_LPM(GPIO43, AF4, FLOAT)
-+#define GPIO48_UART1_CTS	MFP_CFG_LPM(GPIO48, AF4, FLOAT)
-+#define GPIO48_UART1_RTS	MFP_CFG_LPM(GPIO48, AF2, FLOAT)
-+#define GPIO99_UART1_CTS	MFP_CFG_LPM(GPIO99, AF1, FLOAT)
-+#define GPIO99_UART1_RTS	MFP_CFG_LPM(GPIO99, AF6, FLOAT)
-+#define GPIO104_UART1_CTS	MFP_CFG_LPM(GPIO104, AF6, FLOAT)
-+#define GPIO104_UART1_RTS	MFP_CFG_LPM(GPIO104, AF1, FLOAT)
-+#define GPIO45_UART1_DTR	MFP_CFG_LPM(GPIO45, AF4, FLOAT)
-+#define GPIO45_UART1_DSR	MFP_CFG_LPM(GPIO45, AF2, FLOAT)
-+#define GPIO47_UART1_DTR	MFP_CFG_LPM(GPIO47, AF2, FLOAT)
-+#define GPIO47_UART1_DSR	MFP_CFG_LPM(GPIO47, AF4, FLOAT)
-+#define GPIO101_UART1_DTR	MFP_CFG_LPM(GPIO101, AF6, FLOAT)
-+#define GPIO101_UART1_DSR	MFP_CFG_LPM(GPIO101, AF1, FLOAT)
-+#define GPIO103_UART1_DTR	MFP_CFG_LPM(GPIO103, AF1, FLOAT)
-+#define GPIO103_UART1_DSR	MFP_CFG_LPM(GPIO103, AF6, FLOAT)
-+#define GPIO44_UART1_DCD	MFP_CFG_LPM(GPIO44, AF2, FLOAT)
-+#define GPIO100_UART1_DCD	MFP_CFG_LPM(GPIO100, AF1, FLOAT)
-+#define GPIO46_UART1_RI		MFP_CFG_LPM(GPIO46, AF2, FLOAT)
-+#define GPIO102_UART1_RI	MFP_CFG_LPM(GPIO102, AF1, FLOAT)
-+
-+/* UART2 */
-+#define GPIO109_UART2_CTS	MFP_CFG_LPM(GPIO109, AF3, FLOAT)
-+#define GPIO109_UART2_RTS	MFP_CFG_LPM(GPIO109, AF1, FLOAT)
-+#define GPIO112_UART2_CTS	MFP_CFG_LPM(GPIO112, AF1, FLOAT)
-+#define GPIO112_UART2_RTS	MFP_CFG_LPM(GPIO112, AF3, FLOAT)
-+#define GPIO110_UART2_RXD	MFP_CFG_LPM(GPIO110, AF1, FLOAT)
-+#define GPIO110_UART2_TXD	MFP_CFG_LPM(GPIO110, AF3, FLOAT)
-+#define GPIO111_UART2_RXD	MFP_CFG_LPM(GPIO111, AF3, FLOAT)
-+#define GPIO111_UART2_TXD	MFP_CFG_LPM(GPIO111, AF1, FLOAT)
-+
-+/* UART3 */
-+#define GPIO89_UART3_CTS	MFP_CFG_LPM(GPIO89, AF2, FLOAT)
-+#define GPIO89_UART3_RTS	MFP_CFG_LPM(GPIO89, AF4, FLOAT)
-+#define GPIO90_UART3_CTS	MFP_CFG_LPM(GPIO90, AF4, FLOAT)
-+#define GPIO90_UART3_RTS	MFP_CFG_LPM(GPIO90, AF2, FLOAT)
-+#define GPIO105_UART3_CTS	MFP_CFG_LPM(GPIO105, AF1, FLOAT)
-+#define GPIO105_UART3_RTS	MFP_CFG_LPM(GPIO105, AF3, FLOAT)
-+#define GPIO106_UART3_CTS	MFP_CFG_LPM(GPIO106, AF3, FLOAT)
-+#define GPIO106_UART3_RTS	MFP_CFG_LPM(GPIO106, AF1, FLOAT)
-+#define GPIO30_UART3_RXD	MFP_CFG_LPM(GPIO30, AF2, FLOAT)
-+#define GPIO30_UART3_TXD	MFP_CFG_LPM(GPIO30, AF6, FLOAT)
-+#define GPIO31_UART3_RXD	MFP_CFG_LPM(GPIO31, AF6, FLOAT)
-+#define GPIO31_UART3_TXD	MFP_CFG_LPM(GPIO31, AF2, FLOAT)
-+#define GPIO91_UART3_RXD	MFP_CFG_LPM(GPIO91, AF4, FLOAT)
-+#define GPIO91_UART3_TXD	MFP_CFG_LPM(GPIO91, AF2, FLOAT)
-+#define GPIO92_UART3_RXD	MFP_CFG_LPM(GPIO92, AF2, FLOAT)
-+#define GPIO92_UART3_TXD	MFP_CFG_LPM(GPIO92, AF4, FLOAT)
-+#define GPIO107_UART3_RXD	MFP_CFG_LPM(GPIO107, AF3, FLOAT)
-+#define GPIO107_UART3_TXD	MFP_CFG_LPM(GPIO107, AF1, FLOAT)
-+#define GPIO108_UART3_RXD	MFP_CFG_LPM(GPIO108, AF1, FLOAT)
-+#define GPIO108_UART3_TXD	MFP_CFG_LPM(GPIO108, AF3, FLOAT)
-+
-+
-+/* USB 2.0 UTMI */
-+#define GPIO10_UTM_CLK		MFP_CFG(GPIO10, AF1)
-+#define GPIO36_U2D_RXERROR	MFP_CFG(GPIO36, AF3)
-+#define GPIO60_U2D_RXERROR	MFP_CFG(GPIO60, AF1)
-+#define GPIO87_U2D_RXERROR	MFP_CFG(GPIO87, AF5)
-+#define GPIO34_UTM_RXVALID	MFP_CFG(GPIO34, AF3)
-+#define GPIO58_UTM_RXVALID	MFP_CFG(GPIO58, AF2)
-+#define GPIO85_UTM_RXVALID	MFP_CFG(GPIO85, AF5)
-+#define GPIO35_UTM_RXACTIVE	MFP_CFG(GPIO35, AF3)
-+#define GPIO59_UTM_RXACTIVE	MFP_CFG(GPIO59, AF1)
-+#define GPIO86_UTM_RXACTIVE	MFP_CFG(GPIO86, AF5)
-+#define GPIO73_UTM_TXREADY	MFP_CFG(GPIO73, AF1)
-+#define GPIO68_UTM_LINESTATE_0	MFP_CFG(GPIO68, AF3)
-+#define GPIO90_UTM_LINESTATE_0	MFP_CFG(GPIO90, AF3)
-+#define GPIO102_UTM_LINESTATE_0	MFP_CFG(GPIO102, AF3)
-+#define GPIO107_UTM_LINESTATE_0	MFP_CFG(GPIO107, AF4)
-+#define GPIO69_UTM_LINESTATE_1	MFP_CFG(GPIO69, AF3)
-+#define GPIO91_UTM_LINESTATE_1	MFP_CFG(GPIO91, AF3)
-+#define GPIO103_UTM_LINESTATE_1	MFP_CFG(GPIO103, AF3)
-+
-+#define GPIO41_U2D_PHYDATA_0	MFP_CFG(GPIO41, AF3)
-+#define GPIO42_U2D_PHYDATA_1	MFP_CFG(GPIO42, AF3)
-+#define GPIO43_U2D_PHYDATA_2	MFP_CFG(GPIO43, AF3)
-+#define GPIO44_U2D_PHYDATA_3	MFP_CFG(GPIO44, AF3)
-+#define GPIO45_U2D_PHYDATA_4	MFP_CFG(GPIO45, AF3)
-+#define GPIO46_U2D_PHYDATA_5	MFP_CFG(GPIO46, AF3)
-+#define GPIO47_U2D_PHYDATA_6	MFP_CFG(GPIO47, AF3)
-+#define GPIO48_U2D_PHYDATA_7	MFP_CFG(GPIO48, AF3)
-+
-+#define GPIO49_U2D_PHYDATA_0	MFP_CFG(GPIO49, AF3)
-+#define GPIO50_U2D_PHYDATA_1	MFP_CFG(GPIO50, AF3)
-+#define GPIO51_U2D_PHYDATA_2	MFP_CFG(GPIO51, AF3)
-+#define GPIO52_U2D_PHYDATA_3	MFP_CFG(GPIO52, AF3)
-+#define GPIO53_U2D_PHYDATA_4	MFP_CFG(GPIO53, AF3)
-+#define GPIO54_U2D_PHYDATA_5	MFP_CFG(GPIO54, AF3)
-+#define GPIO55_U2D_PHYDATA_6	MFP_CFG(GPIO55, AF3)
-+#define GPIO56_U2D_PHYDATA_7	MFP_CFG(GPIO56, AF3)
-+
-+#define GPIO37_U2D_OPMODE0	MFP_CFG(GPIO37, AF4)
-+#define GPIO61_U2D_OPMODE0	MFP_CFG(GPIO61, AF2)
-+#define GPIO88_U2D_OPMODE0	MFP_CFG(GPIO88, AF7)
-+
-+#define GPIO38_U2D_OPMODE1	MFP_CFG(GPIO38, AF4)
-+#define GPIO62_U2D_OPMODE1	MFP_CFG(GPIO62, AF2)
-+#define GPIO104_U2D_OPMODE1	MFP_CFG(GPIO104, AF4)
-+#define GPIO108_U2D_OPMODE1	MFP_CFG(GPIO108, AF5)
-+
-+#define GPIO74_U2D_RESET	MFP_CFG(GPIO74, AF1)
-+#define GPIO93_U2D_RESET	MFP_CFG(GPIO93, AF2)
-+#define GPIO98_U2D_RESET	MFP_CFG(GPIO98, AF3)
-+
-+#define GPIO67_U2D_SUSPEND	MFP_CFG(GPIO67, AF3)
-+#define GPIO96_U2D_SUSPEND	MFP_CFG(GPIO96, AF2)
-+#define GPIO101_U2D_SUSPEND	MFP_CFG(GPIO101, AF3)
-+
-+#define GPIO66_U2D_TERM_SEL	MFP_CFG(GPIO66, AF5)
-+#define GPIO95_U2D_TERM_SEL	MFP_CFG(GPIO95, AF3)
-+#define GPIO97_U2D_TERM_SEL	MFP_CFG(GPIO97, AF7)
-+#define GPIO100_U2D_TERM_SEL	MFP_CFG(GPIO100, AF5)
-+
-+#define GPIO39_U2D_TXVALID	MFP_CFG(GPIO39, AF4)
-+#define GPIO70_U2D_TXVALID	MFP_CFG(GPIO70, AF5)
-+#define GPIO83_U2D_TXVALID	MFP_CFG(GPIO83, AF7)
-+
-+#define GPIO65_U2D_XCVR_SEL	MFP_CFG(GPIO65, AF5)
-+#define GPIO94_U2D_XCVR_SEL	MFP_CFG(GPIO94, AF3)
-+#define GPIO99_U2D_XCVR_SEL	MFP_CFG(GPIO99, AF5)
-+
-+/* USB Host 1.1 */
-+#define GPIO2_2_USBH_PEN	MFP_CFG(GPIO2_2, AF1)
-+#define GPIO3_2_USBH_PWR	MFP_CFG(GPIO3_2, AF1)
-+
-+/* USB P2 */
-+#define GPIO97_USB_P2_2		MFP_CFG(GPIO97, AF2)
-+#define GPIO97_USB_P2_6		MFP_CFG(GPIO97, AF4)
-+#define GPIO98_USB_P2_2		MFP_CFG(GPIO98, AF4)
-+#define GPIO98_USB_P2_6		MFP_CFG(GPIO98, AF2)
-+#define GPIO99_USB_P2_1		MFP_CFG(GPIO99, AF2)
-+#define GPIO100_USB_P2_4	MFP_CFG(GPIO100, AF2)
-+#define GPIO101_USB_P2_8	MFP_CFG(GPIO101, AF2)
-+#define GPIO102_USB_P2_3	MFP_CFG(GPIO102, AF2)
-+#define GPIO103_USB_P2_5	MFP_CFG(GPIO103, AF2)
-+#define GPIO104_USB_P2_7	MFP_CFG(GPIO104, AF2)
-+
-+/* USB P3 */
-+#define GPIO75_USB_P3_1		MFP_CFG(GPIO75, AF2)
-+#define GPIO76_USB_P3_2		MFP_CFG(GPIO76, AF2)
-+#define GPIO77_USB_P3_3		MFP_CFG(GPIO77, AF2)
-+#define GPIO78_USB_P3_4		MFP_CFG(GPIO78, AF2)
-+#define GPIO79_USB_P3_5		MFP_CFG(GPIO79, AF2)
-+#define GPIO80_USB_P3_6		MFP_CFG(GPIO80, AF2)
-+
-+#define GPIO13_CHOUT0		MFP_CFG(GPIO13, AF6)
-+#define GPIO14_CHOUT1		MFP_CFG(GPIO14, AF6)
-+
-+#define GPIO2_RDY		MFP_CFG(GPIO2, AF1)
-+#define GPIO5_NPIOR		MFP_CFG(GPIO5, AF3)
-+
-+#define GPIO11_PWM0_OUT		MFP_CFG(GPIO11, AF1)
-+#define GPIO12_PWM1_OUT		MFP_CFG(GPIO12, AF1)
-+#define GPIO13_PWM2_OUT		MFP_CFG(GPIO13, AF1)
-+#define GPIO14_PWM3_OUT		MFP_CFG(GPIO14, AF1)
-+
-+#endif /* __ASM_ARCH_MFP_PXA320_H */
---- /dev/null
-+++ linux-2.6.23/include/asm-arm/arch-pxa/mfp.h
-@@ -0,0 +1,576 @@
-+/*
-+ * linux/include/asm-arm/arch-pxa/mfp.h
-+ *
-+ * Multi-Function Pin Definitions
-+ *
-+ * Copyright (C) 2007 Marvell International Ltd.
-+ *
-+ * 2007-8-21: eric miao <eric.y.miao@gmail.com>
-+ *            initial version
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License version 2 as
-+ *  published by the Free Software Foundation.
-+ */
-+
-+#ifndef __ASM_ARCH_MFP_H
-+#define __ASM_ARCH_MFP_H
-+
-+#define MFPR_BASE	(0x40e10000)
-+#define MFPR_SIZE	(PAGE_SIZE)
-+
-+#define mfp_to_gpio(m)	((m) % 128)
-+
-+/* list of all the configurable MFP pins */
-+enum {
-+	MFP_PIN_INVALID = -1,
-+
-+	MFP_PIN_GPIO0 = 0,
-+	MFP_PIN_GPIO1,
-+	MFP_PIN_GPIO2,
-+	MFP_PIN_GPIO3,
-+	MFP_PIN_GPIO4,
-+	MFP_PIN_GPIO5,
-+	MFP_PIN_GPIO6,
-+	MFP_PIN_GPIO7,
-+	MFP_PIN_GPIO8,
-+	MFP_PIN_GPIO9,
-+	MFP_PIN_GPIO10,
-+	MFP_PIN_GPIO11,
-+	MFP_PIN_GPIO12,
-+	MFP_PIN_GPIO13,
-+	MFP_PIN_GPIO14,
-+	MFP_PIN_GPIO15,
-+	MFP_PIN_GPIO16,
-+	MFP_PIN_GPIO17,
-+	MFP_PIN_GPIO18,
-+	MFP_PIN_GPIO19,
-+	MFP_PIN_GPIO20,
-+	MFP_PIN_GPIO21,
-+	MFP_PIN_GPIO22,
-+	MFP_PIN_GPIO23,
-+	MFP_PIN_GPIO24,
-+	MFP_PIN_GPIO25,
-+	MFP_PIN_GPIO26,
-+	MFP_PIN_GPIO27,
-+	MFP_PIN_GPIO28,
-+	MFP_PIN_GPIO29,
-+	MFP_PIN_GPIO30,
-+	MFP_PIN_GPIO31,
-+	MFP_PIN_GPIO32,
-+	MFP_PIN_GPIO33,
-+	MFP_PIN_GPIO34,
-+	MFP_PIN_GPIO35,
-+	MFP_PIN_GPIO36,
-+	MFP_PIN_GPIO37,
-+	MFP_PIN_GPIO38,
-+	MFP_PIN_GPIO39,
-+	MFP_PIN_GPIO40,
-+	MFP_PIN_GPIO41,
-+	MFP_PIN_GPIO42,
-+	MFP_PIN_GPIO43,
-+	MFP_PIN_GPIO44,
-+	MFP_PIN_GPIO45,
-+	MFP_PIN_GPIO46,
-+	MFP_PIN_GPIO47,
-+	MFP_PIN_GPIO48,
-+	MFP_PIN_GPIO49,
-+	MFP_PIN_GPIO50,
-+	MFP_PIN_GPIO51,
-+	MFP_PIN_GPIO52,
-+	MFP_PIN_GPIO53,
-+	MFP_PIN_GPIO54,
-+	MFP_PIN_GPIO55,
-+	MFP_PIN_GPIO56,
-+	MFP_PIN_GPIO57,
-+	MFP_PIN_GPIO58,
-+	MFP_PIN_GPIO59,
-+	MFP_PIN_GPIO60,
-+	MFP_PIN_GPIO61,
-+	MFP_PIN_GPIO62,
-+	MFP_PIN_GPIO63,
-+	MFP_PIN_GPIO64,
-+	MFP_PIN_GPIO65,
-+	MFP_PIN_GPIO66,
-+	MFP_PIN_GPIO67,
-+	MFP_PIN_GPIO68,
-+	MFP_PIN_GPIO69,
-+	MFP_PIN_GPIO70,
-+	MFP_PIN_GPIO71,
-+	MFP_PIN_GPIO72,
-+	MFP_PIN_GPIO73,
-+	MFP_PIN_GPIO74,
-+	MFP_PIN_GPIO75,
-+	MFP_PIN_GPIO76,
-+	MFP_PIN_GPIO77,
-+	MFP_PIN_GPIO78,
-+	MFP_PIN_GPIO79,
-+	MFP_PIN_GPIO80,
-+	MFP_PIN_GPIO81,
-+	MFP_PIN_GPIO82,
-+	MFP_PIN_GPIO83,
-+	MFP_PIN_GPIO84,
-+	MFP_PIN_GPIO85,
-+	MFP_PIN_GPIO86,
-+	MFP_PIN_GPIO87,
-+	MFP_PIN_GPIO88,
-+	MFP_PIN_GPIO89,
-+	MFP_PIN_GPIO90,
-+	MFP_PIN_GPIO91,
-+	MFP_PIN_GPIO92,
-+	MFP_PIN_GPIO93,
-+	MFP_PIN_GPIO94,
-+	MFP_PIN_GPIO95,
-+	MFP_PIN_GPIO96,
-+	MFP_PIN_GPIO97,
-+	MFP_PIN_GPIO98,
-+	MFP_PIN_GPIO99,
-+	MFP_PIN_GPIO100,
-+	MFP_PIN_GPIO101,
-+	MFP_PIN_GPIO102,
-+	MFP_PIN_GPIO103,
-+	MFP_PIN_GPIO104,
-+	MFP_PIN_GPIO105,
-+	MFP_PIN_GPIO106,
-+	MFP_PIN_GPIO107,
-+	MFP_PIN_GPIO108,
-+	MFP_PIN_GPIO109,
-+	MFP_PIN_GPIO110,
-+	MFP_PIN_GPIO111,
-+	MFP_PIN_GPIO112,
-+	MFP_PIN_GPIO113,
-+	MFP_PIN_GPIO114,
-+	MFP_PIN_GPIO115,
-+	MFP_PIN_GPIO116,
-+	MFP_PIN_GPIO117,
-+	MFP_PIN_GPIO118,
-+	MFP_PIN_GPIO119,
-+	MFP_PIN_GPIO120,
-+	MFP_PIN_GPIO121,
-+	MFP_PIN_GPIO122,
-+	MFP_PIN_GPIO123,
-+	MFP_PIN_GPIO124,
-+	MFP_PIN_GPIO125,
-+	MFP_PIN_GPIO126,
-+	MFP_PIN_GPIO127,
-+	MFP_PIN_GPIO0_2,
-+	MFP_PIN_GPIO1_2,
-+	MFP_PIN_GPIO2_2,
-+	MFP_PIN_GPIO3_2,
-+	MFP_PIN_GPIO4_2,
-+	MFP_PIN_GPIO5_2,
-+	MFP_PIN_GPIO6_2,
-+	MFP_PIN_GPIO7_2,
-+	MFP_PIN_GPIO8_2,
-+	MFP_PIN_GPIO9_2,
-+	MFP_PIN_GPIO10_2,
-+	MFP_PIN_GPIO11_2,
-+	MFP_PIN_GPIO12_2,
-+	MFP_PIN_GPIO13_2,
-+	MFP_PIN_GPIO14_2,
-+	MFP_PIN_GPIO15_2,
-+	MFP_PIN_GPIO16_2,
-+	MFP_PIN_GPIO17_2,
-+
-+	MFP_PIN_ULPI_STP,
-+	MFP_PIN_ULPI_NXT,
-+	MFP_PIN_ULPI_DIR,
-+
-+	MFP_PIN_nXCVREN,
-+	MFP_PIN_DF_CLE_nOE,
-+	MFP_PIN_DF_nADV1_ALE,
-+	MFP_PIN_DF_SCLK_E,
-+	MFP_PIN_DF_SCLK_S,
-+	MFP_PIN_nBE0,
-+	MFP_PIN_nBE1,
-+	MFP_PIN_DF_nADV2_ALE,
-+	MFP_PIN_DF_INT_RnB,
-+	MFP_PIN_DF_nCS0,
-+	MFP_PIN_DF_nCS1,
-+	MFP_PIN_nLUA,
-+	MFP_PIN_nLLA,
-+	MFP_PIN_DF_nWE,
-+	MFP_PIN_DF_ALE_nWE,
-+	MFP_PIN_DF_nRE_nOE,
-+	MFP_PIN_DF_ADDR0,
-+	MFP_PIN_DF_ADDR1,
-+	MFP_PIN_DF_ADDR2,
-+	MFP_PIN_DF_ADDR3,
-+	MFP_PIN_DF_IO0,
-+	MFP_PIN_DF_IO1,
-+	MFP_PIN_DF_IO2,
-+	MFP_PIN_DF_IO3,
-+	MFP_PIN_DF_IO4,
-+	MFP_PIN_DF_IO5,
-+	MFP_PIN_DF_IO6,
-+	MFP_PIN_DF_IO7,
-+	MFP_PIN_DF_IO8,
-+	MFP_PIN_DF_IO9,
-+	MFP_PIN_DF_IO10,
-+	MFP_PIN_DF_IO11,
-+	MFP_PIN_DF_IO12,
-+	MFP_PIN_DF_IO13,
-+	MFP_PIN_DF_IO14,
-+	MFP_PIN_DF_IO15,
-+
-+	MFP_PIN_MAX,
-+};
-+
-+/*
-+ * Table that determines the low power modes outputs, with actual settings
-+ * used in parentheses for don't-care values. Except for the float output,
-+ * the configured driven and pulled levels match, so if there is a need for
-+ * non-LPM pulled output, the same configuration could probably be used.
-+ *
-+ * Output value  sleep_oe_n  sleep_data  pullup_en  pulldown_en  pull_sel
-+ *                 (bit 7)    (bit 8)    (bit 14d)   (bit 13d)
-+ *
-+ * Drive 0          0          0           0           X (1)      0
-+ * Drive 1          0          1           X (1)       0	  0
-+ * Pull hi (1)      1          X(1)        1           0	  0
-+ * Pull lo (0)      1          X(0)        0           1	  0
-+ * Z (float)        1          X(0)        0           0	  0
-+ */
-+#define MFP_LPM_DRIVE_LOW	0x8
-+#define MFP_LPM_DRIVE_HIGH    	0x6
-+#define MFP_LPM_PULL_HIGH     	0x7
-+#define MFP_LPM_PULL_LOW      	0x9
-+#define MFP_LPM_FLOAT         	0x1
-+#define MFP_LPM_PULL_NEITHER	0x0
-+
-+/*
-+ * The pullup and pulldown state of the MFP pin is by default determined by
-+ * selected alternate function. In case some buggy devices need to override
-+ * this default behavior,  pxa3xx_mfp_set_pull() can be invoked with one of
-+ * the following definition as the parameter.
-+ *
-+ * Definition       pull_sel  pullup_en  pulldown_en
-+ * MFP_PULL_HIGH        1         1        0
-+ * MFP_PULL_LOW         1         0        1
-+ * MFP_PULL_BOTH        1         1        1
-+ * MFP_PULL_NONE        1         0        0
-+ * MFP_PULL_DEFAULT     0         X        X
-+ *
-+ * NOTE: pxa3xx_mfp_set_pull() will modify the PULLUP_EN and PULLDOWN_EN
-+ * bits,  which will cause potential conflicts with the low power mode
-+ * setting, device drivers should take care of this
-+ */
-+#define MFP_PULL_BOTH		(0x7u)
-+#define MFP_PULL_HIGH		(0x6u)
-+#define MFP_PULL_LOW		(0x5u)
-+#define MFP_PULL_NONE		(0x4u)
-+#define MFP_PULL_DEFAULT	(0x0u)
-+
-+#define MFP_AF0			(0)
-+#define MFP_AF1			(1)
-+#define MFP_AF2			(2)
-+#define MFP_AF3			(3)
-+#define MFP_AF4			(4)
-+#define MFP_AF5			(5)
-+#define MFP_AF6			(6)
-+#define MFP_AF7			(7)
-+
-+#define MFP_DS01X		(0)
-+#define MFP_DS02X		(1)
-+#define MFP_DS03X		(2)
-+#define MFP_DS04X		(3)
-+#define MFP_DS06X		(4)
-+#define MFP_DS08X		(5)
-+#define MFP_DS10X		(6)
-+#define MFP_DS12X		(7)
-+
-+#define MFP_EDGE_BOTH		0x3
-+#define MFP_EDGE_RISE		0x2
-+#define MFP_EDGE_FALL		0x1
-+#define MFP_EDGE_NONE		0x0
-+
-+#define MFPR_AF_MASK		0x0007
-+#define MFPR_DRV_MASK		0x1c00
-+#define MFPR_RDH_MASK		0x0200
-+#define MFPR_LPM_MASK		0xe180
-+#define MFPR_PULL_MASK		0xe000
-+#define MFPR_EDGE_MASK		0x0070
-+
-+#define MFPR_ALT_OFFSET		0
-+#define MFPR_ERE_OFFSET		4
-+#define MFPR_EFE_OFFSET		5
-+#define MFPR_EC_OFFSET		6
-+#define MFPR_SON_OFFSET		7
-+#define MFPR_SD_OFFSET		8
-+#define MFPR_SS_OFFSET		9
-+#define MFPR_DRV_OFFSET		10
-+#define MFPR_PD_OFFSET		13
-+#define MFPR_PU_OFFSET		14
-+#define MFPR_PS_OFFSET		15
-+
-+#define MFPR(af, drv, rdh, lpm, edge) \
-+	(((af) & 0x7) | (((drv) & 0x7) << 10) |\
-+	 (((rdh) & 0x1) << 9) |\
-+	 (((lpm) & 0x3) << 7) |\
-+	 (((lpm) & 0x4) << 12)|\
-+	 (((lpm) & 0x8) << 10)|\
-+	 ((!(edge)) << 6) |\
-+	 (((edge) & 0x1) << 5) |\
-+	 (((edge) & 0x2) << 3))
-+
-+/*
-+ * a possible MFP configuration is represented by a 32-bit integer
-+ * bit  0..15 - MFPR value (16-bit)
-+ * bit 16..31 - mfp pin index (used to obtain the MFPR offset)
-+ *
-+ * to facilitate the definition, the following macros are provided
-+ *
-+ * MFPR_DEFAULT - default MFPR value, with
-+ * 		  alternate function = 0,
-+ * 		  drive strength = fast 1mA (MFP_DS01X)
-+ * 		  low power mode = default
-+ * 		  release dalay hold = false (RDH bit)
-+ * 		  edge detection = none
-+ *
-+ * MFP_CFG	- default MFPR value with alternate function
-+ * MFP_CFG_DRV	- default MFPR value with alternate function and
-+ * 		  pin drive strength
-+ * MFP_CFG_LPM	- default MFPR value with alternate function and
-+ * 		  low power mode
-+ * MFP_CFG_X	- default MFPR value with alternate function,
-+ * 		  pin drive strength and low power mode
-+ *
-+ * use
-+ *
-+ * MFP_CFG_PIN	- to get the MFP pin index
-+ * MFP_CFG_VAL	- to get the corresponding MFPR value
-+ */
-+
-+typedef uint32_t mfp_cfg_t;
-+
-+#define MFP_CFG_PIN(mfp_cfg)	(((mfp_cfg) >> 16) & 0xffff)
-+#define MFP_CFG_VAL(mfp_cfg)	((mfp_cfg) & 0xffff)
-+
-+#define MFPR_DEFAULT	(0x0000)
-+
-+#define MFP_CFG(pin, af)		\
-+	((MFP_PIN_##pin << 16) | MFPR_DEFAULT | (MFP_##af))
-+
-+#define MFP_CFG_DRV(pin, af, drv)	\
-+	((MFP_PIN_##pin << 16) | MFPR_DEFAULT |\
-+	 ((MFP_##drv) << 10) | (MFP_##af))
-+
-+#define MFP_CFG_LPM(pin, af, lpm)	\
-+	((MFP_PIN_##pin << 16) | MFPR_DEFAULT | (MFP_##af) |\
-+	 (((MFP_LPM_##lpm) & 0x3) << 7)  |\
-+	 (((MFP_LPM_##lpm) & 0x4) << 12) |\
-+	 (((MFP_LPM_##lpm) & 0x8) << 10))
-+
-+#define MFP_CFG_X(pin, af, drv, lpm)	\
-+	((MFP_PIN_##pin << 16) | MFPR_DEFAULT |\
-+	 ((MFP_##drv) << 10) | (MFP_##af) |\
-+	 (((MFP_LPM_##lpm) & 0x3) << 7)  |\
-+	 (((MFP_LPM_##lpm) & 0x4) << 12) |\
-+	 (((MFP_LPM_##lpm) & 0x8) << 10))
-+
-+/* common MFP configurations - processor specific ones defined
-+ * in mfp-pxa3xx.h
-+ */
-+#define GPIO0_GPIO		MFP_CFG(GPIO0, AF0)
-+#define GPIO1_GPIO		MFP_CFG(GPIO1, AF0)
-+#define GPIO2_GPIO		MFP_CFG(GPIO2, AF0)
-+#define GPIO3_GPIO		MFP_CFG(GPIO3, AF0)
-+#define GPIO4_GPIO		MFP_CFG(GPIO4, AF0)
-+#define GPIO5_GPIO		MFP_CFG(GPIO5, AF0)
-+#define GPIO6_GPIO		MFP_CFG(GPIO6, AF0)
-+#define GPIO7_GPIO		MFP_CFG(GPIO7, AF0)
-+#define GPIO8_GPIO		MFP_CFG(GPIO8, AF0)
-+#define GPIO9_GPIO		MFP_CFG(GPIO9, AF0)
-+#define GPIO10_GPIO		MFP_CFG(GPIO10, AF0)
-+#define GPIO11_GPIO		MFP_CFG(GPIO11, AF0)
-+#define GPIO12_GPIO		MFP_CFG(GPIO12, AF0)
-+#define GPIO13_GPIO		MFP_CFG(GPIO13, AF0)
-+#define GPIO14_GPIO		MFP_CFG(GPIO14, AF0)
-+#define GPIO15_GPIO		MFP_CFG(GPIO15, AF0)
-+#define GPIO16_GPIO		MFP_CFG(GPIO16, AF0)
-+#define GPIO17_GPIO		MFP_CFG(GPIO17, AF0)
-+#define GPIO18_GPIO		MFP_CFG(GPIO18, AF0)
-+#define GPIO19_GPIO		MFP_CFG(GPIO19, AF0)
-+#define GPIO20_GPIO		MFP_CFG(GPIO20, AF0)
-+#define GPIO21_GPIO		MFP_CFG(GPIO21, AF0)
-+#define GPIO22_GPIO		MFP_CFG(GPIO22, AF0)
-+#define GPIO23_GPIO		MFP_CFG(GPIO23, AF0)
-+#define GPIO24_GPIO		MFP_CFG(GPIO24, AF0)
-+#define GPIO25_GPIO		MFP_CFG(GPIO25, AF0)
-+#define GPIO26_GPIO		MFP_CFG(GPIO26, AF0)
-+#define GPIO27_GPIO		MFP_CFG(GPIO27, AF0)
-+#define GPIO28_GPIO		MFP_CFG(GPIO28, AF0)
-+#define GPIO29_GPIO		MFP_CFG(GPIO29, AF0)
-+#define GPIO30_GPIO		MFP_CFG(GPIO30, AF0)
-+#define GPIO31_GPIO		MFP_CFG(GPIO31, AF0)
-+#define GPIO32_GPIO		MFP_CFG(GPIO32, AF0)
-+#define GPIO33_GPIO		MFP_CFG(GPIO33, AF0)
-+#define GPIO34_GPIO		MFP_CFG(GPIO34, AF0)
-+#define GPIO35_GPIO		MFP_CFG(GPIO35, AF0)
-+#define GPIO36_GPIO		MFP_CFG(GPIO36, AF0)
-+#define GPIO37_GPIO		MFP_CFG(GPIO37, AF0)
-+#define GPIO38_GPIO		MFP_CFG(GPIO38, AF0)
-+#define GPIO39_GPIO		MFP_CFG(GPIO39, AF0)
-+#define GPIO40_GPIO		MFP_CFG(GPIO40, AF0)
-+#define GPIO41_GPIO		MFP_CFG(GPIO41, AF0)
-+#define GPIO42_GPIO		MFP_CFG(GPIO42, AF0)
-+#define GPIO43_GPIO		MFP_CFG(GPIO43, AF0)
-+#define GPIO44_GPIO		MFP_CFG(GPIO44, AF0)
-+#define GPIO45_GPIO		MFP_CFG(GPIO45, AF0)
-+
-+#define GPIO47_GPIO		MFP_CFG(GPIO47, AF0)
-+#define GPIO48_GPIO		MFP_CFG(GPIO48, AF0)
-+
-+#define GPIO53_GPIO		MFP_CFG(GPIO53, AF0)
-+#define GPIO54_GPIO		MFP_CFG(GPIO54, AF0)
-+#define GPIO55_GPIO		MFP_CFG(GPIO55, AF0)
-+
-+#define GPIO57_GPIO		MFP_CFG(GPIO57, AF0)
-+
-+#define GPIO63_GPIO		MFP_CFG(GPIO63, AF0)
-+#define GPIO64_GPIO		MFP_CFG(GPIO64, AF0)
-+#define GPIO65_GPIO		MFP_CFG(GPIO65, AF0)
-+#define GPIO66_GPIO		MFP_CFG(GPIO66, AF0)
-+#define GPIO67_GPIO		MFP_CFG(GPIO67, AF0)
-+#define GPIO68_GPIO		MFP_CFG(GPIO68, AF0)
-+#define GPIO69_GPIO		MFP_CFG(GPIO69, AF0)
-+#define GPIO70_GPIO		MFP_CFG(GPIO70, AF0)
-+#define GPIO71_GPIO		MFP_CFG(GPIO71, AF0)
-+#define GPIO72_GPIO		MFP_CFG(GPIO72, AF0)
-+#define GPIO73_GPIO		MFP_CFG(GPIO73, AF0)
-+#define GPIO74_GPIO		MFP_CFG(GPIO74, AF0)
-+#define GPIO75_GPIO		MFP_CFG(GPIO75, AF0)
-+#define GPIO76_GPIO		MFP_CFG(GPIO76, AF0)
-+#define GPIO77_GPIO		MFP_CFG(GPIO77, AF0)
-+#define GPIO78_GPIO		MFP_CFG(GPIO78, AF0)
-+#define GPIO79_GPIO		MFP_CFG(GPIO79, AF0)
-+#define GPIO80_GPIO		MFP_CFG(GPIO80, AF0)
-+#define GPIO81_GPIO		MFP_CFG(GPIO81, AF0)
-+#define GPIO82_GPIO		MFP_CFG(GPIO82, AF0)
-+#define GPIO83_GPIO		MFP_CFG(GPIO83, AF0)
-+#define GPIO84_GPIO		MFP_CFG(GPIO84, AF0)
-+#define GPIO85_GPIO		MFP_CFG(GPIO85, AF0)
-+#define GPIO86_GPIO		MFP_CFG(GPIO86, AF0)
-+#define GPIO87_GPIO		MFP_CFG(GPIO87, AF0)
-+#define GPIO88_GPIO		MFP_CFG(GPIO88, AF0)
-+#define GPIO89_GPIO		MFP_CFG(GPIO89, AF0)
-+#define GPIO90_GPIO		MFP_CFG(GPIO90, AF0)
-+#define GPIO91_GPIO		MFP_CFG(GPIO91, AF0)
-+#define GPIO92_GPIO		MFP_CFG(GPIO92, AF0)
-+#define GPIO93_GPIO		MFP_CFG(GPIO93, AF0)
-+#define GPIO94_GPIO		MFP_CFG(GPIO94, AF0)
-+#define GPIO95_GPIO		MFP_CFG(GPIO95, AF0)
-+#define GPIO96_GPIO		MFP_CFG(GPIO96, AF0)
-+#define GPIO97_GPIO		MFP_CFG(GPIO97, AF0)
-+#define GPIO98_GPIO		MFP_CFG(GPIO98, AF0)
-+#define GPIO99_GPIO		MFP_CFG(GPIO99, AF0)
-+#define GPIO100_GPIO		MFP_CFG(GPIO100, AF0)
-+#define GPIO101_GPIO		MFP_CFG(GPIO101, AF0)
-+#define GPIO102_GPIO		MFP_CFG(GPIO102, AF0)
-+#define GPIO103_GPIO		MFP_CFG(GPIO103, AF0)
-+#define GPIO104_GPIO		MFP_CFG(GPIO104, AF0)
-+#define GPIO105_GPIO		MFP_CFG(GPIO105, AF0)
-+#define GPIO106_GPIO		MFP_CFG(GPIO106, AF0)
-+#define GPIO107_GPIO		MFP_CFG(GPIO107, AF0)
-+#define GPIO108_GPIO		MFP_CFG(GPIO108, AF0)
-+#define GPIO109_GPIO		MFP_CFG(GPIO109, AF0)
-+#define GPIO110_GPIO		MFP_CFG(GPIO110, AF0)
-+#define GPIO111_GPIO		MFP_CFG(GPIO111, AF0)
-+#define GPIO112_GPIO		MFP_CFG(GPIO112, AF0)
-+#define GPIO113_GPIO		MFP_CFG(GPIO113, AF0)
-+#define GPIO114_GPIO		MFP_CFG(GPIO114, AF0)
-+#define GPIO115_GPIO		MFP_CFG(GPIO115, AF0)
-+#define GPIO116_GPIO		MFP_CFG(GPIO116, AF0)
-+#define GPIO117_GPIO		MFP_CFG(GPIO117, AF0)
-+#define GPIO118_GPIO		MFP_CFG(GPIO118, AF0)
-+#define GPIO119_GPIO		MFP_CFG(GPIO119, AF0)
-+#define GPIO120_GPIO		MFP_CFG(GPIO120, AF0)
-+#define GPIO121_GPIO		MFP_CFG(GPIO121, AF0)
-+#define GPIO122_GPIO		MFP_CFG(GPIO122, AF0)
-+#define GPIO123_GPIO		MFP_CFG(GPIO123, AF0)
-+#define GPIO124_GPIO		MFP_CFG(GPIO124, AF0)
-+#define GPIO125_GPIO		MFP_CFG(GPIO125, AF0)
-+#define GPIO126_GPIO		MFP_CFG(GPIO126, AF0)
-+#define GPIO127_GPIO		MFP_CFG(GPIO127, AF0)
-+
-+#define GPIO0_2_GPIO		MFP_CFG(GPIO0_2, AF0)
-+#define GPIO1_2_GPIO		MFP_CFG(GPIO1_2, AF0)
-+#define GPIO2_2_GPIO		MFP_CFG(GPIO2_2, AF0)
-+#define GPIO3_2_GPIO		MFP_CFG(GPIO3_2, AF0)
-+#define GPIO4_2_GPIO		MFP_CFG(GPIO4_2, AF0)
-+#define GPIO5_2_GPIO		MFP_CFG(GPIO5_2, AF0)
-+#define GPIO6_2_GPIO		MFP_CFG(GPIO6_2, AF0)
-+
-+/*
-+ * each MFP pin will have a MFPR register, since the offset of the
-+ * register varies between processors, the processor specific code
-+ * should initialize the pin offsets by pxa3xx_mfp_init_addr()
-+ *
-+ * pxa3xx_mfp_init_addr - accepts a table of "pxa3xx_mfp_addr_map"
-+ * structure, which represents a range of MFP pins from "start" to
-+ * "end", with the offset begining at "offset", to define a single
-+ * pin, let "end" = -1
-+ *
-+ * use
-+ *
-+ * MFP_ADDR_X() to define a range of pins
-+ * MFP_ADDR()   to define a single pin
-+ * MFP_ADDR_END to signal the end of pin offset definitions
-+ */
-+struct pxa3xx_mfp_addr_map {
-+	unsigned int	start;
-+	unsigned int	end;
-+	unsigned long	offset;
-+};
-+
-+#define MFP_ADDR_X(start, end, offset) \
-+	{ MFP_PIN_##start, MFP_PIN_##end, offset }
-+
-+#define MFP_ADDR(pin, offset) \
-+	{ MFP_PIN_##pin, -1, offset }
-+
-+#define MFP_ADDR_END	{ MFP_PIN_INVALID, 0 }
-+
-+struct pxa3xx_mfp_pin {
-+	unsigned long	mfpr_off;	/* MFPRxx register offset */
-+	unsigned long	mfpr_val;	/* MFPRxx register value */
-+};
-+
-+/*
-+ * pxa3xx_mfp_read()/pxa3xx_mfp_write() - for direct read/write access
-+ * to the MFPR register
-+ */
-+unsigned long pxa3xx_mfp_read(int mfp);
-+void pxa3xx_mfp_write(int mfp, unsigned long mfpr_val);
-+
-+/*
-+ * pxa3xx_mfp_set_afds - set MFP alternate function and drive strength
-+ * pxa3xx_mfp_set_rdh  - set MFP release delay hold on/off
-+ * pxa3xx_mfp_set_lpm  - set MFP low power mode state
-+ * pxa3xx_mfp_set_edge - set MFP edge detection in low power mode
-+ *
-+ * use these functions to override/change the default configuration
-+ * done by pxa3xx_mfp_set_config(s)
-+ */
-+void pxa3xx_mfp_set_afds(int mfp, int af, int ds);
-+void pxa3xx_mfp_set_rdh(int mfp, int rdh);
-+void pxa3xx_mfp_set_lpm(int mfp, int lpm);
-+void pxa3xx_mfp_set_edge(int mfp, int edge);
-+
-+/*
-+ * pxa3xx_mfp_config - configure the MFPR registers
-+ *
-+ * used by board specific initialization code
-+ */
-+void pxa3xx_mfp_config(mfp_cfg_t *mfp_cfgs, int num);
-+
-+/*
-+ * pxa3xx_mfp_init_addr() - initialize the mapping between mfp pin
-+ * index and MFPR register offset
-+ *
-+ * used by processor specific code
-+ */
-+void __init pxa3xx_mfp_init_addr(struct pxa3xx_mfp_addr_map *);
-+void __init pxa3xx_init_mfp(void);
-+
-+#endif /* __ASM_ARCH_MFP_H */
---- linux-2.6.23.orig/include/asm-arm/arch-pxa/pxa-regs.h
-+++ linux-2.6.23/include/asm-arm/arch-pxa/pxa-regs.h
-@@ -1184,7 +1184,7 @@
- 
- #define GPIO_bit(x)	(1 << ((x) & 0x1f))
- 
--#ifdef CONFIG_PXA27x
-+#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx)
- 
- /* Interrupt Controller */
- 
---- /dev/null
-+++ linux-2.6.23/include/asm-arm/arch-pxa/pxa3xx-regs.h
-@@ -0,0 +1,75 @@
-+/*
-+ * linux/include/asm-arm/arch-pxa/pxa3xx-regs.h
-+ *
-+ * PXA3xx specific register definitions
-+ *
-+ * Copyright (C) 2007 Marvell International Ltd.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#ifndef __ASM_ARCH_PXA3XX_REGS_H
-+#define __ASM_ARCH_PXA3XX_REGS_H
-+
-+/*
-+ * Application Subsystem Clock
-+ */
-+#define ACCR		__REG(0x41340000)	/* Application Subsystem Clock Configuration Register */
-+#define ACSR		__REG(0x41340004)	/* Application Subsystem Clock Status Register */
-+#define AICSR		__REG(0x41340008)	/* Application Subsystem Interrupt Control/Status Register */
-+#define CKENA		__REG(0x4134000C)	/* A Clock Enable Register */
-+#define CKENB		__REG(0x41340010)	/* B Clock Enable Register */
-+#define AC97_DIV	__REG(0x41340014)	/* AC97 clock divisor value register */
-+
-+/*
-+ * Clock Enable Bit
-+ */
-+#define CKEN_LCD	1	/* < LCD Clock Enable */
-+#define CKEN_USBH	2	/* < USB host clock enable */
-+#define CKEN_CAMERA	3	/* < Camera interface clock enable */
-+#define CKEN_NAND	4	/* < NAND Flash Controller Clock Enable */
-+#define CKEN_USB2	6	/* < USB 2.0 client clock enable. */
-+#define CKEN_DMC	8	/* < Dynamic Memory Controller clock enable */
-+#define CKEN_SMC	9	/* < Static Memory Controller clock enable */
-+#define CKEN_ISC	10	/* < Internal SRAM Controller clock enable */
-+#define CKEN_BOOT	11	/* < Boot rom clock enable */
-+#define CKEN_MMC1	12	/* < MMC1 Clock enable */
-+#define CKEN_MMC2	13	/* < MMC2 clock enable */
-+#define CKEN_KEYPAD	14	/* < Keypand Controller Clock Enable */
-+#define CKEN_CIR	15	/* < Consumer IR Clock Enable */
-+#define CKEN_USIM0	17	/* < USIM[0] Clock Enable */
-+#define CKEN_USIM1	18	/* < USIM[1] Clock Enable */
-+#define CKEN_TPM	19	/* < TPM clock enable */
-+#define CKEN_UDC	20	/* < UDC clock enable */
-+#define CKEN_BTUART	21	/* < BTUART clock enable */
-+#define CKEN_FFUART	22	/* < FFUART clock enable */
-+#define CKEN_STUART	23	/* < STUART clock enable */
-+#define CKEN_AC97	24	/* < AC97 clock enable */
-+#define CKEN_TOUCH	25	/* < Touch screen Interface Clock Enable */
-+#define CKEN_SSP1	26	/* < SSP1 clock enable */
-+#define CKEN_SSP2	27	/* < SSP2 clock enable */
-+#define CKEN_SSP3	28	/* < SSP3 clock enable */
-+#define CKEN_SSP4	29	/* < SSP4 clock enable */
-+#define CKEN_MSL0	30	/* < MSL0 clock enable */
-+#define CKEN_PWM0	32	/* < PWM[0] clock enable */
-+#define CKEN_PWM1	33	/* < PWM[1] clock enable */
-+#define CKEN_I2C	36	/* < I2C clock enable */
-+#define CKEN_INTC	38	/* < Interrupt controller clock enable */
-+#define CKEN_GPIO	39	/* < GPIO clock enable */
-+#define CKEN_1WIRE	40	/* < 1-wire clock enable */
-+#define CKEN_HSIO2	41	/* < HSIO2 clock enable */
-+#define CKEN_MINI_IM	48	/* < Mini-IM */
-+#define CKEN_MINI_LCD	49	/* < Mini LCD */
-+
-+#if defined(CONFIG_CPU_PXA310)
-+#define CKEN_MMC3	5	/* < MMC3 Clock Enable */
-+#define CKEN_MVED	43	/* < MVED clock enable */
-+#endif
-+
-+/* Note: GCU clock enable bit differs on PXA300/PXA310 and PXA320 */
-+#define PXA300_CKEN_GRAPHICS	42	/* Graphics controller clock enable */
-+#define PXA320_CKEN_GRAPHICS	7	/* Graphics controller clock enable */
-+
-+#endif /* __ASM_ARCH_PXA3XX_REGS_H */
---- linux-2.6.23.orig/include/asm-arm/arch-pxa/timex.h
-+++ linux-2.6.23/include/asm-arm/arch-pxa/timex.h
-@@ -21,4 +21,6 @@
- #else
- #define CLOCK_TICK_RATE 3250000
- #endif
-+#else
-+#define CLOCK_TICK_RATE 3250000
- #endif
---- /dev/null
-+++ linux-2.6.23/include/asm-arm/arch-pxa/zylonite.h
-@@ -0,0 +1,35 @@
-+#ifndef __ASM_ARCH_ZYLONITE_H
-+#define __ASM_ARCH_ZYLONITE_H
-+
-+#define ZYLONITE_ETH_PHYS	0x14000000
-+
-+/* the following variables are processor specific and initialized
-+ * by the corresponding zylonite_pxa3xx_init()
-+ */
-+extern int gpio_backlight;
-+extern int gpio_eth_irq;
-+
-+extern int lcd_id;
-+extern int lcd_orientation;
-+
-+#ifdef CONFIG_CPU_PXA300
-+extern void zylonite_pxa300_init(void);
-+#else
-+static inline void zylonite_pxa300_init(void)
-+{
-+	if (cpu_is_pxa300() || cpu_is_pxa310())
-+		panic("%s: PXA300/PXA310 not supported\n", __FUNCTION__);
-+}
-+#endif
-+
-+#ifdef CONFIG_CPU_PXA320
-+extern void zylonite_pxa320_init(void);
-+#else
-+static inline void zylonite_pxa320_init(void)
-+{
-+	if (cpu_is_pxa320())
-+		panic("%s: PXA320 not supported\n", __FUNCTION__);
-+}
-+#endif
-+
-+#endif /* __ASM_ARCH_ZYLONITE_H */
diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-akita b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-akita
index 52bc84617..914150a1a 100644
--- a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-akita
+++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-akita
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.23
-# Tue Oct 16 13:20:27 2007
+# Linux kernel version: 2.6.24-rc8
+# Sun Jan 20 18:29:33 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -43,9 +43,14 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_FAIR_USER_SCHED=y
+# CONFIG_FAIR_CGROUP_SCHED is not set
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 # CONFIG_BLK_DEV_INITRD is not set
@@ -72,6 +77,7 @@ CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
+CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
@@ -138,7 +144,7 @@ CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_OMAP is not set
 
 #
-# Intel PXA2xx Implementations
+# Intel PXA2xx/PXA3xx Implementations
 #
 # CONFIG_ARCH_LUBBOCK is not set
 # CONFIG_MACH_LOGICPD_PXA270 is not set
@@ -147,10 +153,11 @@ CONFIG_ARCH_PXA=y
 CONFIG_PXA_SHARPSL=y
 # CONFIG_MACH_TRIZEPS4 is not set
 # CONFIG_MACH_EM_X270 is not set
-# CONFIG_MACH_HX2750 is not set
-# CONFIG_MACH_HTCUNIVERSAL is not set
+# CONFIG_MACH_ZYLONITE is not set
+# CONFIG_MACH_ARMCORE is not set
 # CONFIG_PXA_SHARPSL_25x is not set
 CONFIG_PXA_SHARPSL_27x=y
+# CONFIG_MACH_HX2750 is not set
 CONFIG_MACH_AKITA=y
 CONFIG_MACH_SPITZ=y
 CONFIG_MACH_BORZOI=y
@@ -196,10 +203,6 @@ CONFIG_SHARP_SCOOP=y
 #
 # CONFIG_PCI_SYSCALL is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
 CONFIG_PCCARD=m
 # CONFIG_PCMCIA_DEBUG is not set
 CONFIG_PCMCIA=m
@@ -217,6 +220,7 @@ CONFIG_PCMCIA_PXA2XX=m
 # CONFIG_TICK_ONESHOT is not set
 # CONFIG_NO_HZ is not set
 # CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_PREEMPT=y
 CONFIG_HZ=100
 CONFIG_AEABI=y
@@ -229,6 +233,7 @@ CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
@@ -241,9 +246,10 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2  fbcon=rotate:1 dyntick=enable quiet"
+CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2  fbcon=rotate:1 dyntick=enable debug"
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
 
 #
 # CPU Frequency scaling
@@ -312,6 +318,7 @@ CONFIG_INET_TUNNEL=m
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
+# CONFIG_INET_LRO is not set
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
@@ -346,14 +353,60 @@ CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_NETLINK is not set
 # CONFIG_NF_CONNTRACK_ENABLED is not set
 # CONFIG_NF_CONNTRACK is not set
-# CONFIG_NETFILTER_XTABLES is not set
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
 
 #
 # IP: Netfilter Configuration
 #
 CONFIG_IP_NF_QUEUE=m
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_ARPTABLES is not set
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
 
 #
 # IPv6: Netfilter Configuration (EXPERIMENTAL)
@@ -374,10 +427,6 @@ CONFIG_IP_NF_QUEUE=m
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
 # CONFIG_NET_SCHED is not set
 
 #
@@ -415,6 +464,8 @@ CONFIG_IRCOMM=m
 # Dongle support
 #
 # CONFIG_KINGSUN_DONGLE is not set
+# CONFIG_KSDAZZLE_DONGLE is not set
+# CONFIG_KS959_DONGLE is not set
 
 #
 # Old SIR device drivers
@@ -447,9 +498,11 @@ CONFIG_BT_HIDP=m
 #
 CONFIG_BT_HCIUSB=m
 # CONFIG_BT_HCIUSB_SCO is not set
+# CONFIG_BT_HCIBTSDIO is not set
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIUART_LL is not set
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@@ -482,6 +535,7 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
 #
 # Generic Driver Options
 #
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
@@ -508,6 +562,7 @@ CONFIG_MTD_BLOCK=y
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
 # CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -560,6 +615,7 @@ CONFIG_MTD_NAND_IDS=y
 CONFIG_MTD_NAND_SHARPSL=y
 # CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_ALAUDA is not set
 # CONFIG_MTD_ONENAND is not set
 
 #
@@ -576,6 +632,8 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
@@ -598,9 +656,10 @@ CONFIG_IDE_PROC_FS=y
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_GENERIC=y
-# CONFIG_IDEPCI_PCIBUS_ORDER is not set
+# CONFIG_BLK_DEV_PLATFORM is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -640,6 +699,7 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_SCSI_DEBUG is not set
@@ -656,7 +716,9 @@ CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
 # CONFIG_DM_MULTIPATH_RDAC is not set
+# CONFIG_DM_MULTIPATH_HP is not set
 # CONFIG_DM_DELAY is not set
+# CONFIG_DM_UEVENT is not set
 CONFIG_NETDEVICES=y
 # CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
@@ -664,6 +726,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
+# CONFIG_VETH is not set
 # CONFIG_PHYLIB is not set
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=m
@@ -671,6 +734,11 @@ CONFIG_MII=m
 # CONFIG_SMC91X is not set
 # CONFIG_DM9000 is not set
 # CONFIG_SMC911X is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_B44 is not set
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
 
@@ -685,9 +753,9 @@ CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 # CONFIG_LIBERTAS is not set
 CONFIG_HERMES=m
-# CONFIG_ATMEL is not set
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
+# CONFIG_ATMEL is not set
 CONFIG_AIRO_CS=m
 # CONFIG_PCMCIA_WL3501 is not set
 # CONFIG_USB_ZD1201 is not set
@@ -703,7 +771,6 @@ CONFIG_USB_CATC=m
 CONFIG_USB_KAWETH=m
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET_MII=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_CDCETHER=m
@@ -758,7 +825,6 @@ CONFIG_INPUT_MOUSEDEV=m
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
 # CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
 CONFIG_INPUT_POWER=y
@@ -834,7 +900,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_IPMI_HANDLER is not set
-# CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=m
 # CONFIG_NVRAM is not set
 # CONFIG_R3964 is not set
@@ -896,36 +961,18 @@ CONFIG_I2C_PXA=y
 # CONFIG_W1 is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
-CONFIG_MISC_DEVICES=y
-# CONFIG_EEPROM_93CX6 is not set
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MFD_SM501 is not set
-# CONFIG_HTC_ASIC3 is not set
-# CONFIG_HTC_ASIC3_DS1WM is not set
-
-#
-# Multi-Function Devices
-#
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
+# CONFIG_WATCHDOG is not set
 
 #
-# LED drivers
+# Sonics Silicon Backplane
 #
-CONFIG_LEDS_SPITZ=y
-# CONFIG_LEDS_TOSA is not set
-# CONFIG_LEDS_GPIO is not set
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
 
 #
-# LED Triggers
+# Multifunction device drivers
 #
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
-# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+# CONFIG_MFD_SM501 is not set
 
 #
 # Multimedia devices
@@ -937,12 +984,12 @@ CONFIG_VIDEO_V4L2=y
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+# CONFIG_VIDEO_VIVI is not set
 # CONFIG_VIDEO_CPIA is not set
 # CONFIG_VIDEO_CPIA2 is not set
 # CONFIG_VIDEO_SAA5246A is not set
 # CONFIG_VIDEO_SAA5249 is not set
 # CONFIG_TUNER_3036 is not set
-# CONFIG_TUNER_TEA5761 is not set
 CONFIG_V4L_USB_DRIVERS=y
 # CONFIG_VIDEO_PVRUSB2 is not set
 # CONFIG_VIDEO_EM28XX is not set
@@ -970,15 +1017,6 @@ CONFIG_USB_DABUSB=m
 #
 # Graphics support
 #
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_CORGI=y
-
-#
-# Display device support
-#
-# CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
 CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_FB=y
@@ -987,6 +1025,7 @@ CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
 # CONFIG_FB_SYS_FILLRECT is not set
 # CONFIG_FB_SYS_COPYAREA is not set
 # CONFIG_FB_SYS_IMAGEBLIT is not set
@@ -1010,6 +1049,15 @@ CONFIG_FB_PXA_OVERLAY=y
 # CONFIG_FB_MBX is not set
 # CONFIG_FB_W100 is not set
 # CONFIG_FB_VIRTUAL is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_CORGI=y
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
 
 #
 # Console display driver support
@@ -1035,9 +1083,6 @@ CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
 # CONFIG_LOGO_LINUX_CLUT224 is not set
 CONFIG_LOGO_OHAND_CLUT224=y
-# CONFIG_LOGO_OZ240_CLUT224 is not set
-# CONFIG_LOGO_OZ480_CLUT224 is not set
-# CONFIG_LOGO_OZ640_CLUT224 is not set
 
 #
 # Sound
@@ -1114,8 +1159,9 @@ CONFIG_SND_SOC_WM8750=m
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
 CONFIG_HID_SUPPORT=y
-CONFIG_HID=y
+CONFIG_HID=m
 # CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
 
 #
 # USB Input Devices
@@ -1206,6 +1252,7 @@ CONFIG_USB_SERIAL_GENERIC=y
 # CONFIG_USB_SERIAL_AIRPRIME is not set
 # CONFIG_USB_SERIAL_ARK3116 is not set
 CONFIG_USB_SERIAL_BELKIN=m
+# CONFIG_USB_SERIAL_CH341 is not set
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
 # CONFIG_USB_SERIAL_CP2101 is not set
@@ -1289,6 +1336,7 @@ CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 CONFIG_USB_GADGET_SELECTED=y
 # CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_ATMEL_USBA is not set
 # CONFIG_USB_GADGET_FSL_USB2 is not set
 # CONFIG_USB_GADGET_NET2280 is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
@@ -1319,11 +1367,29 @@ CONFIG_MMC_UNSAFE_RESUME=y
 #
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_SDIO_UART is not set
 
 #
 # MMC/SD Host Controller Drivers
 #
 CONFIG_MMC_PXA=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_SPITZ=y
+# CONFIG_LEDS_TOSA is not set
+# CONFIG_LEDS_GPIO is not set
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_IDE_DISK=y
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -1343,6 +1409,7 @@ CONFIG_RTC_INTF_DEV=y
 # I2C RTC drivers
 #
 # CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
@@ -1373,19 +1440,6 @@ CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_DRV_SA1100=y
 
 #
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
-#
-
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1395,7 +1449,6 @@ CONFIG_EXT3_FS=m
 # CONFIG_EXT3_FS_XATTR is not set
 # CONFIG_EXT4DEV_FS is not set
 CONFIG_JBD=m
-# CONFIG_JBD_DEBUG is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
@@ -1437,7 +1490,6 @@ CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
 
 #
@@ -1453,6 +1505,7 @@ CONFIG_RAMFS=y
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
 CONFIG_JFFS2_SUMMARY=y
 # CONFIG_JFFS2_FS_XATTR is not set
 # CONFIG_JFFS2_SYSFS is not set
@@ -1469,16 +1522,12 @@ CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_SQUASHFS_VMALLOC is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
+CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
@@ -1532,10 +1581,6 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_SYSV68_PARTITION is not set
-
-#
-# Native Language Support
-#
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="cp437"
 CONFIG_NLS_CODEPAGE_437=y
@@ -1576,22 +1621,17 @@ CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
 CONFIG_NLS_KOI8_U=m
 CONFIG_NLS_UTF8=y
-
-#
-# Distributed Lock Manager
-#
 # CONFIG_DLM is not set
-
-#
-# Profiling support
-#
+CONFIG_INSTRUMENTATION=y
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
+# CONFIG_MARKERS is not set
 
 #
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
@@ -1619,10 +1659,13 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_FORCED_INLINING is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_FAULT_INJECTION is not set
+# CONFIG_SAMPLES is not set
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEBUG_ERRORS=y
 # CONFIG_DEBUG_LL is not set
@@ -1632,6 +1675,7 @@ CONFIG_DEBUG_ERRORS=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=m
@@ -1652,6 +1696,7 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_XTS is not set
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_FCRYPT is not set
@@ -1666,12 +1711,14 @@ CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_ANUBIS=m
+# CONFIG_CRYPTO_SEED is not set
 CONFIG_CRYPTO_DEFLATE=m
 # CONFIG_CRYPTO_LZO is not set
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
 # CONFIG_CRYPTO_CAMELLIA is not set
 CONFIG_CRYPTO_TEST=m
+# CONFIG_CRYPTO_AUTHENC is not set
 CONFIG_CRYPTO_HW=y
 
 #
diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-bootcdx86 b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-bootcdx86
index ca9dcb592..2744af4a5 100644
--- a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-bootcdx86
+++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-bootcdx86
@@ -1,51 +1,74 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21
-# Mon Jun 11 12:01:43 2007
+# Linux kernel version: 2.6.24-rc8
+# Sun Jan 20 18:34:58 2008
 #
+# CONFIG_64BIT is not set
 CONFIG_X86_32=y
+# CONFIG_X86_64 is not set
+CONFIG_X86=y
 CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_SEMAPHORE_SLEEPERS=y
-CONFIG_X86=y
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
+CONFIG_QUICKLIST=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_DMI=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+# CONFIG_GENERIC_TIME_VSYSCALL is not set
+CONFIG_ARCH_SUPPORTS_OPROFILE=y
+# CONFIG_ZONE_DMA32 is not set
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+# CONFIG_AUDIT_ARCH is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_X86_SMP=y
+CONFIG_X86_HT=y
+CONFIG_X86_BIOS_REBOOT=y
+CONFIG_X86_TRAMPOLINE=y
+CONFIG_KTIME_SCALAR=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_TREE=y
 # CONFIG_IKCONFIG is not set
-# CONFIG_CPUSETS is not set
+CONFIG_LOG_BUF_SHIFT=15
+# CONFIG_CGROUPS is not set
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_FAIR_USER_SCHED=y
+# CONFIG_FAIR_CGROUP_SCHED is not set
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -63,31 +86,30 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 # CONFIG_MODULE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
+CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -108,6 +130,7 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_TICK_ONESHOT=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_SMP=y
 CONFIG_X86_PC=y
 # CONFIG_X86_ELAN is not set
@@ -118,7 +141,9 @@ CONFIG_X86_PC=y
 # CONFIG_X86_VISWS is not set
 # CONFIG_X86_GENERICARCH is not set
 # CONFIG_X86_ES7000 is not set
-# CONFIG_PARAVIRT is not set
+# CONFIG_X86_VSMP is not set
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+# CONFIG_PARAVIRT_GUEST is not set
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set
@@ -128,7 +153,6 @@ CONFIG_X86_PC=y
 CONFIG_MPENTIUMII=y
 # CONFIG_MPENTIUMIII is not set
 # CONFIG_MPENTIUMM is not set
-# CONFIG_MCORE2 is not set
 # CONFIG_MPENTIUM4 is not set
 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
@@ -142,22 +166,24 @@ CONFIG_MPENTIUMII=y
 # CONFIG_MGEODE_LX is not set
 # CONFIG_MCYRIXIII is not set
 # CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_GENERIC_CPU is not set
 CONFIG_X86_GENERIC=y
 CONFIG_X86_CMPXCHG=y
 CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_X86_XADD=y
 CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_INVLPG=y
 CONFIG_X86_BSWAP=y
 CONFIG_X86_POPAD_OK=y
-CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_GOOD_APIC=y
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_TSC=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=4
 CONFIG_HPET_TIMER=y
 CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
@@ -178,25 +204,19 @@ CONFIG_VM86=y
 # CONFIG_MICROCODE is not set
 # CONFIG_X86_MSR is not set
 # CONFIG_X86_CPUID is not set
-
-#
-# Firmware Drivers
-#
-# CONFIG_EDD is not set
-# CONFIG_DELL_RBU is not set
-# CONFIG_DCDBAS is not set
 CONFIG_NOHIGHMEM=y
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
 CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_3G_OPT is not set
 # CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_2G_OPT is not set
 # CONFIG_VMSPLIT_1G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
+# CONFIG_X86_PAE is not set
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -204,9 +224,13 @@ CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPARSEMEM_STATIC=y
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_NR_QUICK=1
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
 # CONFIG_EFI is not set
@@ -217,35 +241,40 @@ CONFIG_HZ_250=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
-# CONFIG_KEXEC is not set
+CONFIG_KEXEC=y
 CONFIG_PHYSICAL_START=0x100000
 # CONFIG_RELOCATABLE is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
-# CONFIG_HOTPLUG_CPU is not set
+CONFIG_HOTPLUG_CPU=y
 # CONFIG_COMPAT_VDSO is not set
 
 #
-# Power management options (ACPI, APM)
+# Power management options
 #
 CONFIG_PM=y
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
-
-#
-# ACPI (Advanced Configuration and Power Interface) Support
-#
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND_SMP_POSSIBLE=y
+CONFIG_SUSPEND=y
+CONFIG_HIBERNATION_SMP_POSSIBLE=y
+# CONFIG_HIBERNATION is not set
 CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_PROCFS=y
+CONFIG_ACPI_PROCFS_POWER=y
+CONFIG_ACPI_SYSFS_POWER=y
+CONFIG_ACPI_PROC_EVENT=y
 CONFIG_ACPI_AC=y
 CONFIG_ACPI_BATTERY=y
 CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_FAN=y
 # CONFIG_ACPI_DOCK is not set
 CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_THERMAL=y
 # CONFIG_ACPI_ASUS is not set
-# CONFIG_ACPI_IBM is not set
 # CONFIG_ACPI_TOSHIBA is not set
 CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
@@ -253,20 +282,18 @@ CONFIG_ACPI_EC=y
 CONFIG_ACPI_POWER=y
 CONFIG_ACPI_SYSTEM=y
 CONFIG_X86_PM_TIMER=y
-# CONFIG_ACPI_CONTAINER is not set
-
-#
-# APM (Advanced Power Management) BIOS Support
-#
+CONFIG_ACPI_CONTAINER=y
+# CONFIG_ACPI_SBS is not set
 # CONFIG_APM is not set
 
 #
 # CPU Frequency scaling
 #
 # CONFIG_CPU_FREQ is not set
+# CONFIG_CPU_IDLE is not set
 
 #
-# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
+# Bus options (PCI etc.)
 #
 CONFIG_PCI=y
 # CONFIG_PCI_GOBIOS is not set
@@ -276,9 +303,12 @@ CONFIG_PCI_GOANY=y
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_DOMAINS=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
+CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
+CONFIG_PCI_LEGACY=y
 CONFIG_HT_IRQ=y
 CONFIG_ISA_DMA_API=y
 CONFIG_ISA=y
@@ -286,19 +316,11 @@ CONFIG_ISA=y
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
 CONFIG_K8_NB=y
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
 # CONFIG_PCCARD is not set
-
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 
 #
-# Executable file formats
+# Executable file formats / Emulations
 #
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_AOUT is not set
@@ -312,9 +334,8 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=m
-CONFIG_PACKET_MMAP=y
+# CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
@@ -338,31 +359,82 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
+# CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NF_CONNTRACK_ENABLED is not set
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -375,10 +447,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
 # CONFIG_NET_SCHED is not set
 
 #
@@ -388,7 +456,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -397,29 +475,14 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 #
 # Generic Driver Options
 #
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=m
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
 CONFIG_PNP=y
 # CONFIG_PNP_DEBUG is not set
 
@@ -429,10 +492,7 @@ CONFIG_PNP=y
 # CONFIG_ISAPNP is not set
 # CONFIG_PNPBIOS is not set
 CONFIG_PNPACPI=y
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_DEV_XD is not set
 # CONFIG_BLK_CPQ_DA is not set
@@ -450,18 +510,14 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
+CONFIG_MISC_DEVICES=y
 # CONFIG_IBM_ASM is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
 # CONFIG_SONY_LAPTOP is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+# CONFIG_THINKPAD_ACPI is not set
 # CONFIG_IDE is not set
 
 #
@@ -469,6 +525,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -490,6 +547,7 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -497,12 +555,9 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -554,68 +609,28 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_SRP is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
-
-#
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
 # CONFIG_FUSION is not set
-# CONFIG_FUSION_SPI is not set
-# CONFIG_FUSION_FC is not set
-# CONFIG_FUSION_SAS is not set
 
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
-
-#
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-
-#
-# Network device support
-#
+# CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
+# CONFIG_VETH is not set
 # CONFIG_NET_SB1000 is not set
-
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
@@ -636,10 +651,6 @@ CONFIG_WD80x3=m
 CONFIG_ULTRA=m
 CONFIG_SMC9194=m
 # CONFIG_NET_VENDOR_RACAL is not set
-
-#
-# Tulip family network device support
-#
 CONFIG_NET_TULIP=y
 # CONFIG_DE2104X is not set
 CONFIG_TULIP=m
@@ -666,6 +677,10 @@ CONFIG_NET_ISA=y
 CONFIG_NE2000=y
 # CONFIG_ZNET is not set
 # CONFIG_SEEQ8005 is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
 CONFIG_NET_PCI=y
 CONFIG_PCNET32=m
 CONFIG_PCNET32_NAPI=y
@@ -676,10 +691,12 @@ CONFIG_ADAPTEC_STARFIRE_NAPI=y
 CONFIG_AC3200=m
 CONFIG_APRICOT=m
 CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
 CONFIG_FORCEDETH=m
 CONFIG_FORCEDETH_NAPI=y
 CONFIG_CS89x0=m
-CONFIG_DGRS=m
 CONFIG_EEPRO100=m
 CONFIG_E100=m
 CONFIG_FEALNX=m
@@ -700,16 +717,15 @@ CONFIG_VIA_RHINE=m
 CONFIG_VIA_RHINE_MMIO=y
 CONFIG_VIA_RHINE_NAPI=y
 CONFIG_SC92031=m
-
-#
-# Ethernet (1000 Mbit)
-#
+CONFIG_NETDEV_1000=y
 CONFIG_ACENIC=m
 CONFIG_ACENIC_OMIT_TIGON_I=y
 CONFIG_DL2K=m
 CONFIG_E1000=m
 CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
+# CONFIG_E1000E is not set
+# CONFIG_IP1000 is not set
 CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
@@ -724,30 +740,33 @@ CONFIG_TIGON3=m
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
 CONFIG_ATL1=m
-
-#
-# Ethernet (10000 Mbit)
-#
+CONFIG_NETDEV_10000=y
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
+# CONFIG_IXGBE is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NETXEN_NIC is not set
-
-#
-# Token Ring devices
-#
+# CONFIG_NIU is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_TEHUTI is not set
 # CONFIG_TR is not set
 
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
 #
-# CONFIG_NET_RADIO is not set
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 
 #
-# Wan interfaces
+# USB Network Adapters
 #
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -758,15 +777,7 @@ CONFIG_ATL1=m
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
@@ -774,6 +785,7 @@ CONFIG_ATL1=m
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -783,10 +795,8 @@ CONFIG_INPUT_MOUSEDEV=m
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_POWER is not set
 
 #
 # Input Device Drivers
@@ -800,12 +810,20 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
 # CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
 # CONFIG_MOUSE_PC110PAD is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -835,6 +853,7 @@ CONFIG_HW_CONSOLE=y
 #
 CONFIG_SERIAL_8250=y
 # CONFIG_SERIAL_8250_CONSOLE is not set
+CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_PNP=y
 CONFIG_SERIAL_8250_NR_UARTS=4
@@ -848,16 +867,7 @@ CONFIG_SERIAL_CORE=y
 # CONFIG_SERIAL_JSM is not set
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_NVRAM is not set
 # CONFIG_RTC is not set
@@ -866,20 +876,6 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_SONYPI is not set
-CONFIG_AGP=m
-CONFIG_AGP_ALI=m
-CONFIG_AGP_ATI=m
-CONFIG_AGP_AMD=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_NVIDIA=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_SWORKS=m
-CONFIG_AGP_VIA=m
-CONFIG_AGP_EFFICEON=m
-# CONFIG_DRM is not set
-# CONFIG_DRM_I830 is not set
-# CONFIG_DRM_I915 is not set
 # CONFIG_MWAVE is not set
 # CONFIG_PC8736x_GPIO is not set
 # CONFIG_NSC_GPIO is not set
@@ -887,16 +883,9 @@ CONFIG_AGP_EFFICEON=m
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_HPET is not set
 # CONFIG_HANGCHECK_TIMER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 # CONFIG_TELCLOCK is not set
-
-#
-# I2C support
-#
+CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
 
 #
@@ -904,17 +893,25 @@ CONFIG_AGP_EFFICEON=m
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PDA_POWER is not set
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_HWMON is not set
+# CONFIG_WATCHDOG is not set
 
 #
-# Hardware Monitoring support
+# Sonics Silicon Backplane
 #
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
+CONFIG_SSB_POSSIBLE=y
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
 
 #
 # Multifunction device drivers
@@ -922,33 +919,82 @@ CONFIG_AGP_EFFICEON=m
 # CONFIG_MFD_SM501 is not set
 
 #
-# Multi-Function Devices
-#
-
-#
 # Multimedia devices
 #
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L1=y
 CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_VIDEO_V4L2=y
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+# CONFIG_VIDEO_VIVI is not set
+# CONFIG_VIDEO_PMS is not set
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_CPIA2 is not set
+# CONFIG_VIDEO_STRADIS is not set
+CONFIG_V4L_USB_DRIVERS=y
+# CONFIG_USB_VICAM is not set
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_KONICAWC is not set
+# CONFIG_USB_QUICKCAM_MESSENGER is not set
+# CONFIG_USB_ET61X251 is not set
+# CONFIG_USB_OV511 is not set
+# CONFIG_USB_SE401 is not set
+# CONFIG_USB_SN9C102 is not set
+# CONFIG_USB_STV680 is not set
+# CONFIG_USB_ZC0301 is not set
+# CONFIG_USB_PWC is not set
+# CONFIG_USB_ZR364XX is not set
+CONFIG_RADIO_ADAPTERS=y
+# CONFIG_RADIO_CADET is not set
+# CONFIG_RADIO_RTRACK is not set
+# CONFIG_RADIO_RTRACK2 is not set
+# CONFIG_RADIO_AZTECH is not set
+# CONFIG_RADIO_GEMTEK is not set
+# CONFIG_RADIO_GEMTEK_PCI is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_MAESTRO is not set
+# CONFIG_RADIO_SF16FMI is not set
+# CONFIG_RADIO_SF16FMR2 is not set
+# CONFIG_RADIO_TERRATEC is not set
+# CONFIG_RADIO_TRUST is not set
+# CONFIG_RADIO_TYPHOON is not set
+# CONFIG_RADIO_ZOLTRIX is not set
+# CONFIG_USB_DSBR is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 # CONFIG_USB_DABUSB is not set
 
 #
 # Graphics support
 #
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+CONFIG_AGP=m
+CONFIG_AGP_ALI=m
+CONFIG_AGP_ATI=m
+CONFIG_AGP_AMD=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_NVIDIA=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_SWORKS=m
+CONFIG_AGP_VIA=m
+CONFIG_AGP_EFFICEON=m
+# CONFIG_DRM is not set
+CONFIG_VGASTATE=y
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
@@ -966,15 +1012,14 @@ CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_IMSTT is not set
 CONFIG_FB_VGA16=y
 CONFIG_FB_VESA=y
-# CONFIG_FB_VESA_STD is not set
-CONFIG_FB_VESA_TNG=y
-CONFIG_FB_VESA_DEFAULT_MODE="640x480-16@60"
-CONFIG_VIDEO_SELECT=y
+# CONFIG_FB_EFI is not set
+# CONFIG_FB_HECUBA is not set
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_RIVA is not set
 # CONFIG_FB_I810 is not set
+# CONFIG_FB_LE80578 is not set
 # CONFIG_FB_INTEL is not set
 # CONFIG_FB_MATROX is not set
 # CONFIG_FB_RADEON is not set
@@ -987,19 +1032,30 @@ CONFIG_VIDEO_SELECT=y
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 # CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
 # CONFIG_FB_CYBLA is not set
 # CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_VIRTUAL is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
 
 #
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
+CONFIG_VIDEO_SELECT=y
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
@@ -1012,18 +1068,11 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
-
-#
-# Logo configuration
-#
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
 # CONFIG_LOGO_LINUX_CLUT224 is not set
 CONFIG_LOGO_OHAND_CLUT224=y
-# CONFIG_LOGO_OZ240_CLUT224 is not set
-# CONFIG_LOGO_OZ480_CLUT224 is not set
-# CONFIG_LOGO_OZ640_CLUT224 is not set
 
 #
 # Sound
@@ -1075,6 +1124,7 @@ CONFIG_SND_AC97_CODEC=y
 # CONFIG_SND_ES968 is not set
 # CONFIG_SND_ES1688 is not set
 # CONFIG_SND_ES18XX is not set
+# CONFIG_SND_SC6000 is not set
 # CONFIG_SND_GUSCLASSIC is not set
 # CONFIG_SND_GUSEXTREME is not set
 # CONFIG_SND_GUSMAX is not set
@@ -1110,6 +1160,7 @@ CONFIG_SND_AC97_CODEC=y
 # CONFIG_SND_CMIPCI is not set
 # CONFIG_SND_CS4281 is not set
 # CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
 # CONFIG_SND_CS5535AUDIO is not set
 # CONFIG_SND_DARLA20 is not set
 # CONFIG_SND_GINA20 is not set
@@ -1153,33 +1204,42 @@ CONFIG_SND_INTEL8X0=y
 # CONFIG_SND_VX222 is not set
 # CONFIG_SND_YMFPCI is not set
 CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 
 #
 # USB devices
 #
 # CONFIG_SND_USB_AUDIO is not set
 # CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_USB_CAIAQ is not set
 
 #
-# SoC audio support
+# System on Chip audio support
 #
 # CONFIG_SND_SOC is not set
 
 #
-# Open Sound System
+# SoC Audio support for SuperH
 #
-# CONFIG_SOUND_PRIME is not set
-CONFIG_AC97_BUS=y
 
 #
-# HID Devices
+# Open Sound System
 #
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=y
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
 
 #
-# USB support
+# USB Input Devices
 #
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1190,8 +1250,10 @@ CONFIG_USB=y
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 CONFIG_USB_SUSPEND=y
+# CONFIG_USB_PERSIST is not set
 # CONFIG_USB_OTG is not set
 
 #
@@ -1201,7 +1263,6 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_SPLIT_ISO=y
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -1209,6 +1270,7 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_UHCI_HCD=y
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
@@ -1227,41 +1289,10 @@ CONFIG_USB_UHCI_HCD=y
 # CONFIG_USB_LIBUSUAL is not set
 
 #
-# USB Input Devices
-#
-CONFIG_USB_HID=y
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-# CONFIG_HID_FF is not set
-# CONFIG_USB_HIDDEV is not set
-# CONFIG_USB_AIPTEK is not set
-CONFIG_USB_WACOM=y
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-# CONFIG_USB_GTCO is not set
-
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_USBNET is not set
 # CONFIG_USB_MON is not set
 
 #
@@ -1305,61 +1336,28 @@ CONFIG_USB_WACOM=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
 # CONFIG_EDAC is not set
-
-#
-# Real Time Clock
-#
 # CONFIG_RTC_CLASS is not set
+# CONFIG_DMADEVICES is not set
+CONFIG_VIRTUALIZATION=y
+# CONFIG_KVM is not set
+# CONFIG_LGUEST is not set
 
 #
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
-#
-
-#
-# Auxiliary Display support
+# Userspace I/O
 #
+# CONFIG_UIO is not set
 
 #
-# Virtualization
+# Firmware Drivers
 #
-# CONFIG_KVM is not set
+# CONFIG_EDD is not set
+# CONFIG_DELL_RBU is not set
+# CONFIG_DCDBAS is not set
+CONFIG_DMIID=y
 
 #
 # File systems
@@ -1367,8 +1365,13 @@ CONFIG_USB_WACOM=y
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
 # CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=m
+CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
@@ -1411,7 +1414,6 @@ CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
 
 #
@@ -1431,28 +1433,30 @@ CONFIG_RAMFS=y
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
-# CONFIG_NFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+# CONFIG_NFS_V3 is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
 # CONFIG_NFSD is not set
+# CONFIG_ROOT_NFS is not set
+CONFIG_LOCKD=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_CIFS is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
 #
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf-8"
 CONFIG_NLS_CODEPAGE_437=y
@@ -1493,33 +1497,27 @@ CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NLS_KOI8_U is not set
 CONFIG_NLS_UTF8=y
-
-#
-# Distributed Lock Manager
-#
 # CONFIG_DLM is not set
-
-#
-# Instrumentation Support
-#
+CONFIG_INSTRUMENTATION=y
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=y
 # CONFIG_KPROBES is not set
+# CONFIG_MARKERS is not set
 
 #
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=15
-CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_SAMPLES is not set
 CONFIG_EARLY_PRINTK=y
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_MPPARSE=y
@@ -1530,10 +1528,7 @@ CONFIG_DOUBLEFAULT=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=m
 CONFIG_CRYPTO_BLKCIPHER=m
@@ -1553,6 +1548,8 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_XTS is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 # CONFIG_CRYPTO_DES is not set
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
@@ -1567,16 +1564,15 @@ CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_ARC4 is not set
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_DEFLATE is not set
 # CONFIG_CRYPTO_LZO is not set
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO_AUTHENC is not set
+CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
@@ -1588,20 +1584,13 @@ CONFIG_CRYPTO_DEV_GEODE=m
 CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=m
 CONFIG_AUDIT_GENERIC=y
-# CONFIG_LZO is not set
 CONFIG_ZLIB_INFLATE=m
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_X86_SMP=y
-CONFIG_X86_HT=y
-CONFIG_X86_BIOS_REBOOT=y
-CONFIG_X86_TRAMPOLINE=y
-CONFIG_KTIME_SCALAR=y
-# CONFIG_SHARPSL_RC is not set
+CONFIG_HAS_DMA=y
diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-c7x0 b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-c7x0
index ca03768ce..6ab816c68 100644
--- a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-c7x0
+++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-c7x0
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.24-rc6
-# Mon Dec 31 17:45:51 2007
+# Linux kernel version: 2.6.24-rc8
+# Sun Jan 20 18:27:11 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -77,6 +77,7 @@ CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
+CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
@@ -247,7 +248,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2   dyntick=enable quiet"
+CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2   dyntick=enable debug"
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
 CONFIG_ATAGS_PROC=y
@@ -259,17 +260,17 @@ CONFIG_CPU_FREQ_PXA25x=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_DEBUG=y
-CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT=y
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 
 #
 # Floating point emulation
@@ -368,14 +369,60 @@ CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_NETLINK is not set
 # CONFIG_NF_CONNTRACK_ENABLED is not set
 # CONFIG_NF_CONNTRACK is not set
-# CONFIG_NETFILTER_XTABLES is not set
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
 
 #
 # IP: Netfilter Configuration
 #
 CONFIG_IP_NF_QUEUE=m
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_ARPTABLES is not set
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
 
 #
 # IPv6: Netfilter Configuration (EXPERIMENTAL)
@@ -603,15 +650,15 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_ATA_OVER_ETH is not set
 CONFIG_MISC_DEVICES=y
 # CONFIG_EEPROM_93CX6 is not set
-CONFIG_IDE=m
+CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
-CONFIG_BLK_DEV_IDE=m
+CONFIG_BLK_DEV_IDE=y
 
 #
 # Please see Documentation/ide.txt for help/info on IDE drives
 #
 # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=m
+CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_IDEDISK_MULTI_MODE is not set
 CONFIG_BLK_DEV_IDECS=m
 # CONFIG_BLK_DEV_IDECD is not set
@@ -624,7 +671,7 @@ CONFIG_IDE_PROC_FS=y
 #
 # IDE chipset support/bugfixes
 #
-CONFIG_IDE_GENERIC=m
+CONFIG_IDE_GENERIC=y
 # CONFIG_BLK_DEV_PLATFORM is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
@@ -1121,9 +1168,9 @@ CONFIG_SND_SOC_WM8731=m
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
 CONFIG_HID_SUPPORT=y
-CONFIG_HID=y
+CONFIG_HID=m
 # CONFIG_HID_DEBUG is not set
-CONFIG_HIDRAW=y
+# CONFIG_HIDRAW is not set
 
 #
 # USB Input Devices
@@ -1404,8 +1451,13 @@ CONFIG_RTC_DRV_SA1100=y
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
 # CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=m
+CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
@@ -1476,6 +1528,9 @@ CONFIG_JFFS2_CMODE_PRIORITY=y
 # CONFIG_JFFS2_CMODE_SIZE is not set
 # CONFIG_JFFS2_CMODE_FAVOURLZO is not set
 CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
@@ -1585,7 +1640,7 @@ CONFIG_OPROFILE=m
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie
index 9b3cb6ae3..79173b39a 100644
--- a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie
+++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie
@@ -1,12 +1,18 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20.4
-# Fri Apr  6 23:20:59 2007
+# Linux kernel version: 2.6.24-rc6
+# Thu Jan 17 20:12:19 2008
 #
 CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
 # CONFIG_GENERIC_TIME is not set
+# CONFIG_GENERIC_CLOCKEVENTS is not set
 CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
 CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -15,36 +21,39 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
 CONFIG_ARCH_MTD_XIP=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_FAIR_USER_SCHED=y
+# CONFIG_FAIR_CGROUP_SCHED is not set
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_BLK_DEV_INITRD is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -59,32 +68,29 @@ CONFIG_BUG=y
 # CONFIG_ELF_CORE is not set
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -116,13 +122,16 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_RPC is not set
@@ -130,6 +139,7 @@ CONFIG_ARCH_SA1100=y
 # CONFIG_ARCH_S3C2410 is not set
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP is not set
 
 #
@@ -151,6 +161,14 @@ CONFIG_SA1100_COLLIE=y
 # CONFIG_SA1100_SSP is not set
 
 #
+# Boot options
+#
+
+#
+# Power management
+#
+
+#
 # Processor Type
 #
 CONFIG_CPU_32=y
@@ -168,21 +186,21 @@ CONFIG_CPU_CP15_MMU=y
 #
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_OUTER_CACHE is not set
 CONFIG_SHARP_LOCOMO=y
 CONFIG_SHARP_PARAM=y
+CONFIG_SHARPSL_PM=y
 CONFIG_SHARP_SCOOP=y
 
 #
 # Bus support
 #
 CONFIG_ISA=y
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-CONFIG_PCCARD=y
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_PCCARD=m
 # CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=y
+CONFIG_PCMCIA=m
 CONFIG_PCMCIA_LOAD_CIS=y
 CONFIG_PCMCIA_IOCTL=y
 
@@ -191,11 +209,12 @@ CONFIG_PCMCIA_IOCTL=y
 #
 # CONFIG_I82365 is not set
 # CONFIG_TCIC is not set
-CONFIG_PCMCIA_SA1100=y
+CONFIG_PCMCIA_SA1100=m
 
 #
 # Kernel Features
 #
+# CONFIG_TICK_ONESHOT is not set
 CONFIG_PREEMPT=y
 CONFIG_NO_IDLE_HZ=y
 CONFIG_HZ=100
@@ -210,8 +229,12 @@ CONFIG_DISCONTIGMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_NEED_MULTIPLE_NODES=y
 # CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_LEDS is not set
 CONFIG_ALIGNMENT_TRAP=y
 
@@ -220,8 +243,10 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 mem=64M fbcon=rotate:1 dyntick=enable debug"
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
 
 #
 # CPU Frequency scaling
@@ -253,8 +278,10 @@ CONFIG_BINFMT_MISC=m
 CONFIG_PM=y
 # CONFIG_PM_LEGACY is not set
 # CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
-CONFIG_APM=y
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND_UP_POSSIBLE=y
+CONFIG_SUSPEND=y
+CONFIG_APM_EMULATION=y
 
 #
 # Networking
@@ -264,13 +291,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=m
 CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
+CONFIG_UNIX=m
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=m
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -285,24 +312,21 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+# CONFIG_INET_LRO is not set
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-
-#
-# IP: Virtual Server Configuration
-#
-# CONFIG_IP_VS is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set
 # CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
@@ -325,12 +349,60 @@ CONFIG_NETFILTER=y
 #
 # CONFIG_NETFILTER_NETLINK is not set
 # CONFIG_NF_CONNTRACK_ENABLED is not set
-# CONFIG_NETFILTER_XTABLES is not set
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
 
 #
 # IP: Netfilter Configuration
 #
 CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
 
 #
 # IPv6: Netfilter Configuration (EXPERIMENTAL)
@@ -341,15 +413,7 @@ CONFIG_IP_NF_QUEUE=m
 # DCCP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -362,10 +426,6 @@ CONFIG_IP_NF_QUEUE=m
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
 # CONFIG_NET_SCHED is not set
 
 #
@@ -416,10 +476,7 @@ CONFIG_IRTTY_SIR=m
 #
 # FIR device drivers
 #
-CONFIG_USB_IRDA=m
-# CONFIG_SIGMATEL_FIR is not set
 CONFIG_SA1100_FIR=m
-# CONFIG_MCS_FIR is not set
 CONFIG_BT=m
 CONFIG_BT_L2CAP=m
 CONFIG_BT_SCO=m
@@ -433,25 +490,32 @@ CONFIG_BT_HIDP=m
 #
 # Bluetooth device drivers
 #
-# CONFIG_BT_HCIUSB is not set
+# CONFIG_BT_HCIBTSDIO is not set
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIUART_LL is not set
 CONFIG_BT_HCIDTL1=m
 CONFIG_BT_HCIBT3C=m
 CONFIG_BT_HCIBLUECARD=m
 CONFIG_BT_HCIBTUART=m
 CONFIG_BT_HCIVHCI=m
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+CONFIG_WIRELESS_EXT=y
+# CONFIG_MAC80211 is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
 # CONFIG_IEEE80211_SOFTMAC is not set
-CONFIG_WIRELESS_EXT=y
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -460,20 +524,14 @@ CONFIG_WIRELESS_EXT=y
 #
 # Generic Driver Options
 #
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -493,6 +551,7 @@ CONFIG_MTD_BLOCK=y
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
 # CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -510,16 +569,14 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_CFI_I4 is not set
 # CONFIG_MTD_CFI_I8 is not set
 # CONFIG_MTD_RAM is not set
-CONFIG_MTD_ROM=y
+# CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-CONFIG_MTD_OBSOLETE_CHIPS=y
 CONFIG_MTD_SHARP=y
 
 #
 # Mapping drivers for chip access
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_PHYSMAP is not set
 CONFIG_MTD_SA1100=y
 # CONFIG_MTD_PLATRAM is not set
 
@@ -539,43 +596,24 @@ CONFIG_MTD_SA1100=y
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
-
-#
-# OneNAND Flash Device Drivers
-#
 # CONFIG_MTD_ONENAND is not set
 
 #
-# Parallel port support
+# UBI - Unsorted block images
 #
+# CONFIG_MTD_UBI is not set
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
 # CONFIG_PNP is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=m
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_UB is not set
 # CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+# CONFIG_MISC_DEVICES is not set
 CONFIG_IDE=m
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=m
@@ -592,15 +630,30 @@ CONFIG_BLK_DEV_IDECS=m
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 
 #
 # IDE chipset support/bugfixes
 #
 # CONFIG_IDE_GENERIC is not set
+# CONFIG_BLK_DEV_PLATFORM is not set
 # CONFIG_IDE_ARM is not set
-# CONFIG_IDE_CHIPSETS is not set
+
+#
+# Other IDE chipsets support
+#
+
+#
+# Note: most of these also require special kernel boot parameters
+#
+# CONFIG_BLK_DEV_4DRIVES is not set
+# CONFIG_BLK_DEV_ALI14XX is not set
+# CONFIG_BLK_DEV_DTC2278 is not set
+# CONFIG_BLK_DEV_HT6560B is not set
+# CONFIG_BLK_DEV_QD65XX is not set
+# CONFIG_BLK_DEV_UMC8672 is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -608,6 +661,7 @@ CONFIG_BLK_DEV_IDECS=m
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -630,6 +684,7 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -637,15 +692,13 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_SCSI_AHA152X is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_ADVANSYS is not set
 # CONFIG_SCSI_IN2000 is not set
 # CONFIG_SCSI_DTC3280 is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -658,72 +711,22 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_SYM53C416 is not set
 # CONFIG_SCSI_T128 is not set
 # CONFIG_SCSI_DEBUG is not set
-
-#
-# PCMCIA SCSI adapter support
-#
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-CONFIG_MD=y
-# CONFIG_BLK_DEV_MD is not set
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_EMC=m
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
+# CONFIG_MD is not set
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
-
-#
-# ARCnet devices
-#
+# CONFIG_VETH is not set
 # CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=m
+# CONFIG_AX88796 is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NET_VENDOR_SMC is not set
 # CONFIG_SMC91X is not set
@@ -733,64 +736,37 @@ CONFIG_MII=m
 # CONFIG_DEPCA is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_ISA is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
 # CONFIG_NET_PCI is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
+# CONFIG_B44 is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 # CONFIG_TR is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-# CONFIG_NET_WIRELESS_RTNETLINK is not set
-
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-# CONFIG_ARLAN is not set
-# CONFIG_WAVELAN is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
-# CONFIG_PCMCIA_RAYCS is not set
-
-#
-# Wireless 802.11b ISA/PCI cards support
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
+CONFIG_WLAN_80211=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_HERMES=m
-# CONFIG_ATMEL is not set
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
-# CONFIG_AIRO_CS is not set
-# CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_USB_ZD1201 is not set
+CONFIG_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_WL3501=m
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
 CONFIG_HOSTAP_CS=m
-CONFIG_NET_WIRELESS=y
-
-#
-# PCMCIA network device support
-#
 CONFIG_NET_PCMCIA=y
 # CONFIG_PCMCIA_3C589 is not set
 # CONFIG_PCMCIA_3C574 is not set
@@ -800,10 +776,6 @@ CONFIG_PCMCIA_PCNET=m
 # CONFIG_PCMCIA_SMC91C92 is not set
 # CONFIG_PCMCIA_XIRC2PS is not set
 # CONFIG_PCMCIA_AXNET is not set
-
-#
-# Wan interfaces
-#
 # CONFIG_WAN is not set
 CONFIG_PPP=m
 # CONFIG_PPP_MULTILINK is not set
@@ -814,16 +786,13 @@ CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
 # CONFIG_PPP_MPPE is not set
 # CONFIG_PPPOE is not set
+# CONFIG_PPPOL2TP is not set
 # CONFIG_SLIP is not set
 CONFIG_SLHC=m
 # CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
 
 #
@@ -831,19 +800,19 @@ CONFIG_SLHC=m
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
 #
-CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV=m
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
 # CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_EVDEV=m
 # CONFIG_INPUT_EVBUG is not set
-CONFIG_INPUT_POWER=y
+CONFIG_INPUT_POWER=m
 
 #
 # Input Device Drivers
@@ -852,12 +821,14 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_ATKBD is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_LOCOMO=y
+CONFIG_KEYBOARD_LOCOMO=m
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_GPIO is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -894,16 +865,7 @@ CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=m
 # CONFIG_NVRAM is not set
 # CONFIG_DTLK is not set
@@ -916,48 +878,9 @@ CONFIG_HW_RANDOM=m
 # CONFIG_CARDMAN_4000 is not set
 # CONFIG_CARDMAN_4040 is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-# CONFIG_I2C_CHARDEV is not set
-
-#
-# I2C Algorithms
-#
-# CONFIG_I2C_ALGOBIT is not set
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALGOPCA is not set
-
-#
-# I2C Hardware Bus support
-#
-# CONFIG_I2C_ELEKTOR is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_PCA_ISA is not set
-
-#
-# Miscellaneous I2C Chip support
-#
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
+CONFIG_DEVPORT=y
+# CONFIG_I2C is not set
 
 #
 # SPI support
@@ -970,27 +893,28 @@ CONFIG_SPI_MASTER=y
 # SPI Master Controller Drivers
 #
 # CONFIG_SPI_BITBANG is not set
-CONFIG_SPI_LOCOMO=m
 
 #
 # SPI Protocol Masters
 #
-
-#
-# Dallas's 1-wire bus
-#
+# CONFIG_SPI_AT25 is not set
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_WATCHDOG is not set
 
 #
-# Hardware Monitoring support
+# Sonics Silicon Backplane
 #
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
 
 #
-# Misc devices
+# Multifunction device drivers
 #
-# CONFIG_TIFM_CORE is not set
+# CONFIG_MFD_SM501 is not set
 
 #
 # Multimedia Capabilities Port drivers
@@ -999,29 +923,7 @@ CONFIG_MCP=y
 CONFIG_MCP_SA11X0=y
 CONFIG_MCP_UCB1200=y
 CONFIG_MCP_UCB1200_TS=m
-
-#
-# Multi-Function Devices
-#
-
-#
-# LED devices
-#
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=m
-
-#
-# LED drivers
-#
-CONFIG_LEDS_LOCOMO=m
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+# CONFIG_MCP_COLLIE_TS is not set
 
 #
 # Multimedia devices
@@ -1030,47 +932,13 @@ CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L1=y
 CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_VIDEO_V4L2=y
-
-#
-# Video Capture Adapters
-#
-
-#
-# Video Capture Adapters
-#
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 # CONFIG_VIDEO_VIVI is not set
 # CONFIG_VIDEO_PMS is not set
 # CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_CPIA2 is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_TUNER_3036 is not set
-
-#
-# V4L USB devices
-#
-# CONFIG_VIDEO_PVRUSB2 is not set
-# CONFIG_VIDEO_EM28XX is not set
-# CONFIG_VIDEO_USBVISION is not set
-# CONFIG_USB_VICAM is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_KONICAWC is not set
-# CONFIG_USB_QUICKCAM_MESSENGER is not set
-# CONFIG_USB_ET61X251 is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
-# CONFIG_USB_W9968CF is not set
-# CONFIG_USB_OV511 is not set
-# CONFIG_USB_SE401 is not set
-# CONFIG_USB_SN9C102 is not set
-# CONFIG_USB_STV680 is not set
-# CONFIG_USB_ZC0301 is not set
-# CONFIG_USB_PWC is not set
-
-#
-# Radio Adapters
-#
+CONFIG_RADIO_ADAPTERS=y
 # CONFIG_RADIO_CADET is not set
 # CONFIG_RADIO_RTRACK is not set
 # CONFIG_RADIO_RTRACK2 is not set
@@ -1082,29 +950,49 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 # CONFIG_RADIO_TRUST is not set
 # CONFIG_RADIO_TYPHOON is not set
 # CONFIG_RADIO_ZOLTRIX is not set
-# CONFIG_USB_DSBR is not set
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-# CONFIG_USB_DABUSB is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 
 #
 # Graphics support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+# CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
 CONFIG_FB_SA1100=y
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_VIRTUAL is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_LTV350QV is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_CORGI is not set
+CONFIG_BACKLIGHT_LOCOMO=y
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
 
 #
 # Console display driver support
@@ -1113,6 +1001,7 @@ CONFIG_FB_SA1100=y
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
@@ -1125,17 +1014,7 @@ CONFIG_FONT_8x8=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
-
-#
-# Logo configuration
-#
 # CONFIG_LOGO is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_DEVICE=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
-CONFIG_BACKLIGHT_LOCOMO=y
 
 #
 # Sound
@@ -1172,9 +1051,8 @@ CONFIG_SND_DUMMY=m
 #
 
 #
-# USB devices
+# SPI devices
 #
-# CONFIG_SND_USB_AUDIO is not set
 
 #
 # PCMCIA devices
@@ -1183,248 +1061,56 @@ CONFIG_SND_DUMMY=m
 # CONFIG_SND_PDAUDIOCF is not set
 
 #
-# SoC audio support
+# System on Chip audio support
 #
 # CONFIG_SND_SOC is not set
 
 #
-# Open Sound System
+# SoC Audio support for SuperH
 #
-# CONFIG_SOUND_PRIME is not set
 
 #
-# HID Devices
+# Open Sound System
 #
+# CONFIG_SOUND_PRIME is not set
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
+# CONFIG_USB_SUPPORT is not set
+CONFIG_MMC=m
+CONFIG_MMC_DEBUG=y
+CONFIG_MMC_UNSAFE_RESUME=y
 
 #
-# USB support
-#
-CONFIG_USB_ARCH_HAS_HCD=y
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-CONFIG_USB=m
-# CONFIG_USB_DEBUG is not set
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_SUSPEND is not set
-# CONFIG_USB_OTG is not set
-
-#
-# USB Host Controller Drivers
-#
-# CONFIG_USB_ISP116X_HCD is not set
-CONFIG_USB_SL811_HCD=m
-CONFIG_USB_SL811_CS=m
-
-#
-# USB Device Class drivers
+# MMC/SD Card Drivers
 #
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_PRINTER is not set
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_SDIO_UART is not set
 
 #
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+# MMC/SD Host Controller Drivers
 #
+CONFIG_MMC_SPI=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=m
 
 #
-# may also be needed; see USB_STORAGE Help for more information
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_DPCM is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_KARMA is not set
-# CONFIG_USB_LIBUSUAL is not set
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=m
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-# CONFIG_HID_FF is not set
-# CONFIG_USB_HIDDEV is not set
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-CONFIG_USB_USBNET_MII=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
-# CONFIG_USB_NET_GL620A is not set
-CONFIG_USB_NET_NET1080=m
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-CONFIG_USB_NET_CDC_SUBSET=m
-# CONFIG_USB_ALI_M5632 is not set
-# CONFIG_USB_AN2720 is not set
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_EPSON2888 is not set
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_MON=y
-
-#
-# USB port drivers
-#
-
-#
-# USB Serial Converter support
-#
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-# CONFIG_USB_SERIAL_AIRCABLE is not set
-CONFIG_USB_SERIAL_AIRPRIME=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP2101=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-# CONFIG_USB_SERIAL_MOS7720 is not set
-# CONFIG_USB_SERIAL_MOS7840 is not set
-# CONFIG_USB_SERIAL_NAVMAN is not set
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_HP4X=m
-CONFIG_USB_SERIAL_SAFE=m
-# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-# CONFIG_USB_SERIAL_OPTION is not set
-# CONFIG_USB_SERIAL_OMNINET is not set
-# CONFIG_USB_SERIAL_DEBUG is not set
-CONFIG_USB_EZUSB=y
-
-#
-# USB Miscellaneous drivers
-#
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_AUERSWALD is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_PHIDGET is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_TEST is not set
-
-#
-# USB DSL modem support
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_NET2280 is not set
-# CONFIG_USB_GADGET_PXA2XX is not set
-# CONFIG_USB_GADGET_PXA27X is not set
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LH7A40X is not set
-# CONFIG_USB_GADGET_OMAP is not set
-# CONFIG_USB_GADGET_AT91 is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-# CONFIG_USB_GADGET_DUALSPEED is not set
-
-#
-# MMC/SD Card support
+# LED drivers
 #
-CONFIG_MMC=m
-CONFIG_MMC_DEBUG=y
-CONFIG_MMC_BLOCK=m
-# CONFIG_MMC_TIFM_SD is not set
-CONFIG_MMC_SPI=m
-CONFIG_MMC_UNSAFE_RESUME=y
-
+CONFIG_LEDS_LOCOMO=m
+# CONFIG_LEDS_GPIO is not set
 
 #
-# Real Time Clock
+# LED Triggers
 #
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_CLASS=m
 
 #
 # RTC interfaces
@@ -1433,33 +1119,37 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
 
 #
-# RTC drivers
+# Platform RTC drivers
 #
-# CONFIG_RTC_DRV_X1205 is not set
-# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_CMOS is not set
 # CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
-CONFIG_RTC_DRV_SA1100=y
-# CONFIG_RTC_DRV_TEST is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_SA1100=m
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=m
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
+CONFIG_EXT3_FS=m
 # CONFIG_EXT4DEV_FS is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
@@ -1502,7 +1192,6 @@ CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
 
 #
@@ -1518,11 +1207,13 @@ CONFIG_RAMFS=y
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
 # CONFIG_JFFS2_SUMMARY is not set
 # CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_SYSFS is not set
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_LZO=y
+# CONFIG_JFFS2_LZO is not set
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set
 CONFIG_CRAMFS=m
@@ -1535,10 +1226,7 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
+CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
@@ -1550,6 +1238,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
+# CONFIG_SUNRPC_BIND34 is not set
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 CONFIG_SMB_FS=m
@@ -1564,7 +1253,6 @@ CONFIG_CIFS=m
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1586,10 +1274,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
-
-#
-# Native Language Support
-#
+# CONFIG_SYSV68_PARTITION is not set
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="cp437"
 CONFIG_NLS_CODEPAGE_437=y
@@ -1630,37 +1315,36 @@ CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
 CONFIG_NLS_KOI8_U=m
 CONFIG_NLS_UTF8=m
-
-#
-# Distributed Lock Manager
-#
 # CONFIG_DLM is not set
-
-#
-# Profiling support
-#
+CONFIG_INSTRUMENTATION=y
 # CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
 
 #
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
@@ -1668,9 +1352,13 @@ CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_FORCED_INLINING is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_SAMPLES is not set
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEBUG_ERRORS=y
 # CONFIG_DEBUG_LL is not set
@@ -1680,15 +1368,12 @@ CONFIG_DEBUG_ERRORS=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
 CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI=m
 CONFIG_CRYPTO_BLKCIPHER=m
 CONFIG_CRYPTO_HASH=m
-CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER=m
 CONFIG_CRYPTO_HMAC=m
 # CONFIG_CRYPTO_XCBC is not set
 CONFIG_CRYPTO_NULL=m
@@ -1702,8 +1387,12 @@ CONFIG_CRYPTO_WP512=m
 # CONFIG_CRYPTO_GF128MUL is not set
 CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=m
+# CONFIG_CRYPTO_PCBC is not set
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_XTS is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=m
+# CONFIG_CRYPTO_FCRYPT is not set
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -1715,15 +1404,15 @@ CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_ANUBIS=m
+# CONFIG_CRYPTO_SEED is not set
 CONFIG_CRYPTO_DEFLATE=m
 # CONFIG_CRYPTO_LZO is not set
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_CAMELLIA is not set
 CONFIG_CRYPTO_TEST=m
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_HW is not set
 
 #
 # Library routines
@@ -1731,11 +1420,13 @@ CONFIG_CRYPTO_TEST=m
 CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
+CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
+CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
-CONFIG_LZO=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
-# CONFIG_SHARPSL_RC is not set
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-htcuniversal b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-htcuniversal
index 3ebc1e929..ead49c2c8 100644
--- a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-htcuniversal
+++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-htcuniversal
@@ -241,6 +241,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2   dyntick=enable debug"
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
 
 #
 # CPU Frequency scaling
@@ -337,28 +338,59 @@ CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_NETLINK is not set
 # CONFIG_NF_CONNTRACK_ENABLED is not set
 # CONFIG_NF_CONNTRACK is not set
-# CONFIG_NETFILTER_XTABLES is not set
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
 
 #
 # IP: Netfilter Configuration
 #
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_SCTP is not set
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
 
 #
 # QoS and/or fair queueing
diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-hx2000 b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-hx2000
index 348cf828e..a80ec678a 100644
--- a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-hx2000
+++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-hx2000
@@ -1,12 +1,18 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20-rc2
-# Mon Jan  1 01:49:04 2007
+# Linux kernel version: 2.6.24-rc8
+# Sun Jan 20 18:10:53 2008
 #
 CONFIG_ARM=y
-# CONFIG_GENERIC_TIME is not set
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
 CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -15,34 +21,38 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
 CONFIG_ARCH_MTD_XIP=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_FAIR_USER_SCHED=y
+# CONFIG_FAIR_CGROUP_SCHED is not set
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
@@ -58,32 +68,30 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_KMOD is not set
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -115,13 +123,16 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_PNX4008 is not set
 CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_RPC is not set
@@ -129,23 +140,34 @@ CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_S3C2410 is not set
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP is not set
+CONFIG_DMABOUNCE=y
 
 #
-# Intel PXA2xx Implementations
+# Intel PXA2xx/PXA3xx Implementations
 #
-# CONFIG_ARCH_LUBBOCK is not set
+CONFIG_ARCH_LUBBOCK=y
 # CONFIG_MACH_LOGICPD_PXA270 is not set
 # CONFIG_MACH_MAINSTONE is not set
 # CONFIG_ARCH_PXA_IDP is not set
 # CONFIG_PXA_SHARPSL is not set
 # CONFIG_MACH_TRIZEPS4 is not set
-CONFIG_MACH_HX2750=y
-CONFIG_PXA27x=y
-CONFIG_PXA_SSP=y
+# CONFIG_MACH_EM_X270 is not set
+# CONFIG_MACH_ZYLONITE is not set
+# CONFIG_MACH_ARMCORE is not set
+CONFIG_PXA25x=y
 CONFIG_PXA_KEYS=y
 
 #
+# Boot options
+#
+
+#
+# Power management
+#
+
+#
 # Processor Type
 #
 CONFIG_CPU_32=y
@@ -162,16 +184,17 @@ CONFIG_CPU_CP15_MMU=y
 #
 CONFIG_ARM_THUMB=y
 # CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_OUTER_CACHE is not set
 CONFIG_IWMMXT=y
 CONFIG_XSCALE_PMU=y
+CONFIG_SA1111=y
+CONFIG_FORCE_MAX_ZONEORDER=9
 
 #
 # Bus support
 #
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_PCCARD=y
 # CONFIG_PCMCIA_DEBUG is not set
 CONFIG_PCMCIA=y
@@ -186,8 +209,11 @@ CONFIG_PCMCIA_PXA2XX=y
 #
 # Kernel Features
 #
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_PREEMPT=y
-CONFIG_NO_IDLE_HZ=y
 CONFIG_HZ=100
 CONFIG_AEABI=y
 CONFIG_OABI_COMPAT=y
@@ -199,8 +225,13 @@ CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_LEDS is not set
 CONFIG_ALIGNMENT_TRAP=y
 
 #
@@ -210,7 +241,8 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2   dyntick=enable debug"
 # CONFIG_XIP_KERNEL is not set
-# CONFIG_KEXEC is not set
+CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
 
 #
 # CPU Frequency scaling
@@ -241,9 +273,11 @@ CONFIG_BINFMT_ELF=y
 CONFIG_PM=y
 # CONFIG_PM_LEGACY is not set
 CONFIG_PM_DEBUG=y
-# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
-CONFIG_APM=y
+# CONFIG_PM_VERBOSE is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND_UP_POSSIBLE=y
+CONFIG_SUSPEND=y
+# CONFIG_APM_EMULATION is not set
 
 #
 # Networking
@@ -253,13 +287,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=m
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -278,31 +312,83 @@ CONFIG_SYN_COOKIES=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
 CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
+# CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NF_CONNTRACK_ENABLED is not set
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -315,10 +401,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
 # CONFIG_NET_SCHED is not set
 
 #
@@ -328,13 +410,22 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+CONFIG_WIRELESS_EXT=y
+# CONFIG_MAC80211 is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
 # CONFIG_IEEE80211_CRYPT_CCMP is not set
 # CONFIG_IEEE80211_CRYPT_TKIP is not set
 # CONFIG_IEEE80211_SOFTMAC is not set
-CONFIG_WIRELESS_EXT=y
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -343,20 +434,14 @@ CONFIG_WIRELESS_EXT=y
 #
 # Generic Driver Options
 #
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_STANDALONE=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 CONFIG_MTD_CONCAT=y
@@ -369,12 +454,14 @@ CONFIG_MTD_CMDLINE_PARTS=y
 # User Modules And Translation Layers
 #
 CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
 # CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -405,7 +492,6 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 # CONFIG_MTD_XIP is not set
 
 #
@@ -413,6 +499,7 @@ CONFIG_MTD_CFI_UTIL=y
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_PXA2XX is not set
 # CONFIG_MTD_ARM_INTEGRATOR is not set
 # CONFIG_MTD_SHARP_SL is not set
 # CONFIG_MTD_PLATRAM is not set
@@ -431,29 +518,15 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
-
-#
-# OneNAND Flash Device Drivers
-#
 # CONFIG_MTD_ONENAND is not set
 
 #
-# Parallel port support
+# UBI - Unsorted block images
 #
+# CONFIG_MTD_UBI is not set
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -462,13 +535,10 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
@@ -484,14 +554,16 @@ CONFIG_BLK_DEV_IDECS=y
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 
 #
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_GENERIC=y
+# CONFIG_BLK_DEV_PLATFORM is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -499,106 +571,38 @@ CONFIG_IDE_GENERIC=y
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
-
-#
-# PHY device support
-#
+# CONFIG_VETH is not set
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=m
+# CONFIG_AX88796 is not set
 # CONFIG_SMC91X is not set
 # CONFIG_DM9000 is not set
 # CONFIG_SMC911X is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_B44 is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 
 #
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-# CONFIG_NET_WIRELESS_RTNETLINK is not set
-
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
-# CONFIG_PCMCIA_RAYCS is not set
-
-#
-# Wireless 802.11b ISA/PCI cards support
-#
-CONFIG_HERMES=m
-# CONFIG_ATMEL is not set
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-# CONFIG_AIRO_CS is not set
-# CONFIG_PCMCIA_WL3501 is not set
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-CONFIG_HOSTAP_CS=m
-CONFIG_NET_WIRELESS=y
-
-#
-# PCMCIA network device support
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 CONFIG_NET_PCMCIA=y
 # CONFIG_PCMCIA_3C589 is not set
 # CONFIG_PCMCIA_3C574 is not set
@@ -608,10 +612,6 @@ CONFIG_PCMCIA_PCNET=m
 # CONFIG_PCMCIA_SMC91C92 is not set
 # CONFIG_PCMCIA_XIRC2PS is not set
 # CONFIG_PCMCIA_AXNET is not set
-
-#
-# Wan interfaces
-#
 # CONFIG_WAN is not set
 CONFIG_PPP=m
 # CONFIG_PPP_MULTILINK is not set
@@ -622,16 +622,13 @@ CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
 # CONFIG_PPP_MPPE is not set
 # CONFIG_PPPOE is not set
+# CONFIG_PPPOL2TP is not set
 # CONFIG_SLIP is not set
 CONFIG_SLHC=m
 # CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
 
 #
@@ -639,6 +636,7 @@ CONFIG_SLHC=m
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -648,10 +646,8 @@ CONFIG_INPUT_MOUSEDEV=m
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=240
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320
 # CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
-CONFIG_INPUT_POWER=y
 
 #
 # Input Device Drivers
@@ -659,7 +655,9 @@ CONFIG_INPUT_POWER=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
 # CONFIG_TOUCHSCREEN_GUNZE is not set
 # CONFIG_TOUCHSCREEN_ELO is not set
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
@@ -668,7 +666,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
 # CONFIG_TOUCHSCREEN_UCB1400 is not set
-CONFIG_TOUCHSCREEN_TSC2101=y
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
 # CONFIG_INPUT_MISC is not set
 
 #
@@ -700,19 +698,9 @@ CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=m
 # CONFIG_NVRAM is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 
 #
@@ -722,15 +710,7 @@ CONFIG_HW_RANDOM=m
 # CONFIG_CARDMAN_4000 is not set
 # CONFIG_CARDMAN_4040 is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 
 #
@@ -738,40 +718,21 @@ CONFIG_HW_RANDOM=m
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
-
-#
-# Misc devices
-#
-# CONFIG_TIFM_CORE is not set
-
-#
-# Multi-Function Devices
-#
-CONFIG_MFD_TSC2101=y
-
-#
-# LED devices
-#
-# CONFIG_NEW_LEDS is not set
+# CONFIG_WATCHDOG is not set
 
 #
-# LED drivers
+# Sonics Silicon Backplane
 #
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
 
 #
-# LED Triggers
+# Multifunction device drivers
 #
+# CONFIG_MFD_SM501 is not set
 
 #
 # Multimedia devices
@@ -780,24 +741,41 @@ CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L1=y
 CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_VIDEO_V4L2=y
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+# CONFIG_VIDEO_VIVI is not set
+# CONFIG_VIDEO_CPIA is not set
+CONFIG_RADIO_ADAPTERS=y
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 
 #
 # Graphics support
 #
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+# CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_PXA=y
 CONFIG_FB_PXA_LCD_QVGA=y
@@ -806,6 +784,15 @@ CONFIG_FB_PXA_LCD_QVGA=y
 # CONFIG_FB_PXA_PARAMETERS is not set
 # CONFIG_FB_MBX is not set
 # CONFIG_FB_VIRTUAL is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_CORGI is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
 
 #
 # Console display driver support
@@ -813,42 +800,26 @@ CONFIG_FB_PXA_LCD_QVGA=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
-
-#
-# Logo configuration
-#
 CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
 # CONFIG_LOGO_LINUX_CLUT224 is not set
 CONFIG_LOGO_OHAND_CLUT224=y
-# CONFIG_LOGO_OZ240_CLUT224 is not set
-# CONFIG_LOGO_OZ480_CLUT224 is not set
-# CONFIG_LOGO_OZ640_CLUT224 is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_DEVICE=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_LCD_DEVICE=y
-CONFIG_BACKLIGHT_HX2750=y
 
 #
 # Sound
 #
 # CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
-CONFIG_HID=y
-
-#
-# USB support
-#
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 # CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -862,21 +833,22 @@ CONFIG_USB_ARCH_HAS_OHCI=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_PXA=y
-# CONFIG_MMC_TIFM_SD is not set
 CONFIG_MMC_UNSAFE_RESUME=y
 
+#
+# MMC/SD Card Drivers
+#
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_SDIO_UART is not set
 
 #
-# Real Time Clock
+# MMC/SD Host Controller Drivers
 #
+CONFIG_MMC_PXA=y
+# CONFIG_NEW_LEDS is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -890,25 +862,41 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# SPI RTC drivers
+#
 
 #
-# RTC drivers
+# Platform RTC drivers
 #
+# CONFIG_RTC_DRV_CMOS is not set
 # CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
-CONFIG_RTC_DRV_SA1100=y
-# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_M48T59 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_SA1100=y
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
 # CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=m
+CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
@@ -950,7 +938,6 @@ CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
 
 #
@@ -966,34 +953,41 @@ CONFIG_RAMFS=y
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
 # CONFIG_JFFS2_SUMMARY is not set
 # CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_SYSFS is not set
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set
 CONFIG_CRAMFS=y
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_SQUASHFS_VMALLOC is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
-# CONFIG_NFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+# CONFIG_NFS_V3 is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
 # CONFIG_NFSD is not set
+CONFIG_LOCKD=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+# CONFIG_SUNRPC_BIND34 is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_CIFS is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1015,10 +1009,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
-
-#
-# Native Language Support
-#
+# CONFIG_SYSV68_PARTITION is not set
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="cp437"
 CONFIG_NLS_CODEPAGE_437=y
@@ -1059,38 +1050,36 @@ CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NLS_KOI8_U is not set
 CONFIG_NLS_UTF8=y
-
-#
-# Distributed Lock Manager
-#
 # CONFIG_DLM is not set
-
-#
-# Profiling support
-#
+CONFIG_INSTRUMENTATION=y
 # CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
 
 #
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
-CONFIG_TIMER_STATS=y
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
+CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_SLAB is not set
 CONFIG_DEBUG_PREEMPT=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
@@ -1098,9 +1087,13 @@ CONFIG_DEBUG_PREEMPT=y
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_FORCED_INLINING=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_SAMPLES is not set
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
@@ -1111,10 +1104,7 @@ CONFIG_DEBUG_LL=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=m
@@ -1132,8 +1122,12 @@ CONFIG_CRYPTO_MANAGER=m
 # CONFIG_CRYPTO_GF128MUL is not set
 CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=m
+# CONFIG_CRYPTO_PCBC is not set
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_XTS is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 # CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
@@ -1144,14 +1138,15 @@ CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_SEED is not set
 CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_LZO is not set
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 CONFIG_CRYPTO_CRC32C=y
+# CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO_AUTHENC is not set
+CONFIG_CRYPTO_HW=y
 
 #
 # Library routines
@@ -1159,10 +1154,13 @@ CONFIG_CRYPTO_CRC32C=y
 CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
-# CONFIG_SHARPSL_RC is not set
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-poodle b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-poodle
index 072e10c9c..aec7c318b 100644
--- a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-poodle
+++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-poodle
@@ -1,42 +1,64 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.17
-# Mon Jul 10 23:38:56 2006
+# Linux kernel version: 2.6.24-rc8
+# Sun Jan 20 18:37:45 2008
 #
 CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
 CONFIG_ARCH_MTD_XIP=y
 CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_SYSCTL=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_FAIR_USER_SCHED=y
+# CONFIG_FAIR_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_UID16=y
+# CONFIG_BLK_DEV_INITRD is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -46,27 +68,30 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -84,51 +109,71 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # System Type
 #
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
 # CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_CO285 is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP3XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_PNX4008 is not set
 CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_S3C2410 is not set
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91RM9200 is not set
 
 #
-# Intel PXA2xx Implementations
+# Intel PXA2xx/PXA3xx Implementations
 #
 # CONFIG_ARCH_LUBBOCK is not set
 # CONFIG_MACH_LOGICPD_PXA270 is not set
 # CONFIG_MACH_MAINSTONE is not set
 # CONFIG_ARCH_PXA_IDP is not set
 CONFIG_PXA_SHARPSL=y
-# CONFIG_MACH_HX2750 is not set
+# CONFIG_MACH_TRIZEPS4 is not set
+# CONFIG_MACH_EM_X270 is not set
+# CONFIG_MACH_ZYLONITE is not set
+# CONFIG_MACH_ARMCORE is not set
 CONFIG_PXA_SHARPSL_25x=y
 # CONFIG_PXA_SHARPSL_27x is not set
+# CONFIG_MACH_HX2750 is not set
 CONFIG_MACH_POODLE=y
 # CONFIG_MACH_CORGI is not set
 # CONFIG_MACH_SHEPHERD is not set
 # CONFIG_MACH_HUSKY is not set
 # CONFIG_MACH_TOSA is not set
 CONFIG_PXA25x=y
-# CONFIG_PXA_KEYS is not set
 CONFIG_PXA_SSP=y
+# CONFIG_PXA_KEYS is not set
+
+#
+# Boot options
+#
+
+#
+# Power management
+#
 
 #
 # Processor Type
@@ -139,13 +184,17 @@ CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
 
 #
 # Processor Features
 #
 CONFIG_ARM_THUMB=y
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_OUTER_CACHE is not set
+# CONFIG_IWMMXT is not set
 CONFIG_XSCALE_PMU=y
-CONFIG_KEXEC=y
 CONFIG_SHARP_LOCOMO=y
 CONFIG_SHARP_PARAM=y
 CONFIG_SHARPSL_PM=y
@@ -154,10 +203,8 @@ CONFIG_SHARP_SCOOP=y
 #
 # Bus support
 #
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_PCCARD=y
 # CONFIG_PCMCIA_DEBUG is not set
 CONFIG_PCMCIA=y
@@ -172,10 +219,14 @@ CONFIG_PCMCIA_PXA2XX=y
 #
 # Kernel Features
 #
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_PREEMPT=y
-CONFIG_NO_IDLE_HZ=y
 CONFIG_HZ=100
-# CONFIG_AEABI is not set
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -184,7 +235,12 @@ CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_ALIGNMENT_TRAP=y
 
 #
@@ -194,6 +250,9 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2  fbcon=rotate:1 dyntick=enable debug"
 # CONFIG_XIP_KERNEL is not set
+CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
+CONFIG_CPU_FREQ_PXA25x=y
 
 #
 # CPU Frequency scaling
@@ -205,12 +264,13 @@ CONFIG_CPU_FREQ_STAT=y
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_PXA25x=y
 
 #
 # Floating point emulation
@@ -229,7 +289,6 @@ CONFIG_FPE_NWFPE=y
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_AOUT=m
 CONFIG_BINFMT_MISC=m
-# CONFIG_ARTHUR is not set
 
 #
 # Power management options
@@ -237,7 +296,10 @@ CONFIG_BINFMT_MISC=m
 CONFIG_PM=y
 # CONFIG_PM_LEGACY is not set
 # CONFIG_PM_DEBUG is not set
-CONFIG_APM=y
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND_UP_POSSIBLE=y
+CONFIG_SUSPEND=y
+CONFIG_APM_EMULATION=y
 
 #
 # Networking
@@ -247,12 +309,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=m
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -267,25 +330,36 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+# CONFIG_INET_LRO is not set
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
-
-#
-# IP: Virtual Server Configuration
-#
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set
 # CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
+# CONFIG_IPV6_MIP6 is not set
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
 CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_NETWORK_SECMARK is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
 
@@ -293,43 +367,70 @@ CONFIG_NETFILTER=y
 # Core Netfilter Configuration
 #
 # CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NETFILTER_XTABLES is not set
+# CONFIG_NF_CONNTRACK_ENABLED is not set
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
 
 #
 # IP: Netfilter Configuration
 #
-CONFIG_IP_NF_CONNTRACK=m
-# CONFIG_IP_NF_CT_ACCT is not set
-# CONFIG_IP_NF_CONNTRACK_MARK is not set
-# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-CONFIG_IP_NF_CT_PROTO_SCTP=m
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_IRC=m
-# CONFIG_IP_NF_NETBIOS_NS is not set
-CONFIG_IP_NF_TFTP=m
-CONFIG_IP_NF_AMANDA=m
-# CONFIG_IP_NF_PPTP is not set
-# CONFIG_IP_NF_H323 is not set
 CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
 
 #
 # IPv6: Netfilter Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP6_NF_QUEUE is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
+# CONFIG_IP6_NF_IPTABLES is not set
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -340,14 +441,10 @@ CONFIG_IP_NF_QUEUE=m
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
 # CONFIG_NET_SCHED is not set
+CONFIG_NET_SCH_FIFO=y
 
 #
 # Network testing
@@ -383,6 +480,9 @@ CONFIG_IRCOMM=m
 #
 # Dongle support
 #
+# CONFIG_KINGSUN_DONGLE is not set
+# CONFIG_KSDAZZLE_DONGLE is not set
+# CONFIG_KS959_DONGLE is not set
 
 #
 # Old SIR device drivers
@@ -399,6 +499,7 @@ CONFIG_IRCOMM=m
 # CONFIG_USB_IRDA is not set
 # CONFIG_SIGMATEL_FIR is not set
 CONFIG_PXA_FICP=m
+# CONFIG_MCS_FIR is not set
 CONFIG_BT=m
 CONFIG_BT_L2CAP=m
 CONFIG_BT_SCO=m
@@ -414,9 +515,11 @@ CONFIG_BT_HIDP=m
 #
 CONFIG_BT_HCIUSB=m
 # CONFIG_BT_HCIUSB_SCO is not set
+# CONFIG_BT_HCIBTSDIO is not set
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIUART_LL is not set
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@@ -425,13 +528,27 @@ CONFIG_BT_HCIBT3C=m
 CONFIG_BT_HCIBLUECARD=m
 CONFIG_BT_HCIBTUART=m
 CONFIG_BT_HCIVHCI=m
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+CONFIG_CFG80211=m
+CONFIG_NL80211=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_MAC80211=m
+CONFIG_MAC80211_RCSIMPLE=y
+# CONFIG_MAC80211_LEDS is not set
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
-# CONFIG_IEEE80211_SOFTMAC is not set
-CONFIG_WIRELESS_EXT=y
+CONFIG_IEEE80211_SOFTMAC=m
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -440,19 +557,14 @@ CONFIG_WIRELESS_EXT=y
 #
 # Generic Driver Options
 #
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -465,11 +577,14 @@ CONFIG_MTD_CMDLINE_PARTS=y
 # User Modules And Translation Layers
 #
 CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -489,12 +604,12 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_RAM is not set
 CONFIG_MTD_ROM=y
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 
 #
 # Mapping drivers for chip access
 #
 CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_PHYSMAP is not set
 CONFIG_MTD_SHARP_SL=y
 # CONFIG_MTD_PLATRAM is not set
 
@@ -512,49 +627,37 @@ CONFIG_MTD_SHARP_SL=y
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-
-#
-# NAND Flash Device Drivers
-#
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_VERIFY_WRITE=y
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_H1900 is not set
 CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 CONFIG_MTD_NAND_SHARPSL=y
 # CONFIG_MTD_NAND_NANDSIM is not set
-
-#
-# OneNAND Flash Device Drivers
-#
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_ALAUDA is not set
 # CONFIG_MTD_ONENAND is not set
 
 #
-# Parallel port support
+# UBI - Unsorted block images
 #
+# CONFIG_MTD_UBI is not set
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_UB is not set
 # CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 CONFIG_IDE=y
+CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
 
 #
@@ -569,14 +672,16 @@ CONFIG_BLK_DEV_IDECS=y
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 
 #
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_GENERIC=y
+# CONFIG_BLK_DEV_PLATFORM is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -584,6 +689,9 @@ CONFIG_IDE_GENERIC=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -603,130 +711,102 @@ CONFIG_CHR_DEV_SG=m
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
-# SCSI Transport Attributes
+# SCSI Transports
 #
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-
-#
-# SCSI low-level drivers
-#
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
-# CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_DEBUG is not set
-
-#
-# PCMCIA SCSI adapter support
-#
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+# CONFIG_ATA is not set
 CONFIG_MD=y
+# CONFIG_BLK_DEV_MD is not set
 CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
 CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
+# CONFIG_DM_MULTIPATH_RDAC is not set
+# CONFIG_DM_MULTIPATH_HP is not set
+# CONFIG_DM_DELAY is not set
+# CONFIG_DM_UEVENT is not set
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
-
-#
-# PHY device support
-#
+# CONFIG_VETH is not set
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=m
+# CONFIG_AX88796 is not set
 # CONFIG_SMC91X is not set
 # CONFIG_DM9000 is not set
+# CONFIG_SMC911X is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_B44 is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 
 #
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-# CONFIG_NET_WIRELESS_RTNETLINK is not set
-
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-
-#
-# Wireless 802.11 Frequency Hopping cards support
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
-
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+# CONFIG_LIBERTAS is not set
 CONFIG_HERMES=m
-# CONFIG_ATMEL is not set
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
+# CONFIG_ATMEL is not set
 # CONFIG_AIRO_CS is not set
 # CONFIG_PCMCIA_WL3501 is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_RTL8187 is not set
+# CONFIG_P54_COMMON is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
 CONFIG_HOSTAP_CS=m
-CONFIG_NET_WIRELESS=y
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
+# CONFIG_ZD1211RW is not set
+# CONFIG_RT2X00 is not set
 
 #
-# PCMCIA network device support
+# USB Network Adapters
 #
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+# CONFIG_USB_NET_DM9601 is not set
+# CONFIG_USB_NET_GL620A is not set
+CONFIG_USB_NET_NET1080=m
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_MCS7830 is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+CONFIG_USB_NET_ZAURUS=m
 CONFIG_NET_PCMCIA=y
 # CONFIG_PCMCIA_3C589 is not set
 # CONFIG_PCMCIA_3C574 is not set
@@ -736,10 +816,6 @@ CONFIG_PCMCIA_PCNET=m
 # CONFIG_PCMCIA_SMC91C92 is not set
 # CONFIG_PCMCIA_XIRC2PS is not set
 # CONFIG_PCMCIA_AXNET is not set
-
-#
-# Wan interfaces
-#
 # CONFIG_WAN is not set
 CONFIG_PPP=m
 # CONFIG_PPP_MULTILINK is not set
@@ -750,21 +826,21 @@ CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
 # CONFIG_PPP_MPPE is not set
 # CONFIG_PPPOE is not set
+# CONFIG_PPPOL2TP is not set
 # CONFIG_SLIP is not set
+CONFIG_SLHC=m
 # CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
 
 #
 # Input device support
 #
 CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -774,7 +850,6 @@ CONFIG_INPUT_MOUSEDEV=m
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=240
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320
 # CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
 CONFIG_INPUT_POWER=y
@@ -789,17 +864,31 @@ CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_LOCOMO=y
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_CORGI is not set
 # CONFIG_KEYBOARD_SPITZ is not set
+# CONFIG_KEYBOARD_GPIO is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_CORGI=y
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
 # CONFIG_TOUCHSCREEN_GUNZE is not set
 # CONFIG_TOUCHSCREEN_ELO is not set
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
 # CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_UCB1400 is not set
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
 CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
 CONFIG_INPUT_UINPUT=m
 
 #
@@ -814,6 +903,7 @@ CONFIG_INPUT_UINPUT=m
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
@@ -834,42 +924,21 @@ CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=m
 # CONFIG_NVRAM is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 
 #
-# Ftape, the floppy tape device driver
-#
-
-#
 # PCMCIA character devices
 #
 # CONFIG_SYNCLINK_CS is not set
 # CONFIG_CARDMAN_4000 is not set
 # CONFIG_CARDMAN_4040 is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
-
-#
-# I2C support
-#
 CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
 # CONFIG_I2C_CHARDEV is not set
 
 #
@@ -882,22 +951,28 @@ CONFIG_I2C_ALGOBIT=y
 #
 # I2C Hardware Bus support
 #
+# CONFIG_I2C_GPIO is not set
 CONFIG_I2C_PXA=y
 # CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_STUB is not set
-# CONFIG_I2C_PCA_ISA is not set
+# CONFIG_I2C_TINY_USB is not set
 
 #
 # Miscellaneous I2C Chip support
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -908,44 +983,21 @@ CONFIG_I2C_PXA=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
-
-#
-# Misc devices
-#
+# CONFIG_WATCHDOG is not set
 
 #
-# Multi-Function Devices
+# Sonics Silicon Backplane
 #
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
 
 #
-# LED devices
+# Multifunction device drivers
 #
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-
-#
-# LED drivers
-#
-CONFIG_LEDS_LOCOMO=y
-# CONFIG_LEDS_TOSA is not set
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
+# CONFIG_MFD_SM501 is not set
 
 #
 # Multimedia devices
@@ -954,81 +1006,85 @@ CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L1=y
 CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_VIDEO_V4L2=y
-
-#
-# Video Capture Adapters
-#
-
-#
-# Video Capture Adapters
-#
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 # CONFIG_VIDEO_VIVI is not set
 # CONFIG_VIDEO_CPIA is not set
 # CONFIG_VIDEO_CPIA2 is not set
 # CONFIG_VIDEO_SAA5246A is not set
 # CONFIG_VIDEO_SAA5249 is not set
 # CONFIG_TUNER_3036 is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
-
-#
-# Encoders and Decoders
-#
-# CONFIG_VIDEO_MSP3400 is not set
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_WM8775 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_CX25840 is not set
-# CONFIG_VIDEO_SAA711X is not set
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-
-#
-# V4L USB devices
-#
+CONFIG_V4L_USB_DRIVERS=y
+# CONFIG_VIDEO_PVRUSB2 is not set
 # CONFIG_VIDEO_EM28XX is not set
-CONFIG_USB_DSBR=m
+# CONFIG_VIDEO_USBVISION is not set
 CONFIG_VIDEO_USBVIDEO=m
 CONFIG_USB_VICAM=m
 CONFIG_USB_IBMCAM=m
 CONFIG_USB_KONICAWC=m
+# CONFIG_USB_QUICKCAM_MESSENGER is not set
 # CONFIG_USB_ET61X251 is not set
+# CONFIG_VIDEO_OVCAMCHIP is not set
+# CONFIG_USB_W9968CF is not set
 CONFIG_USB_OV511=m
 CONFIG_USB_SE401=m
 CONFIG_USB_SN9C102=m
 CONFIG_USB_STV680=m
-# CONFIG_USB_W9968CF is not set
 # CONFIG_USB_ZC0301 is not set
 # CONFIG_USB_PWC is not set
-
-#
-# Radio Adapters
-#
-# CONFIG_RADIO_MAESTRO is not set
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
+# CONFIG_USB_ZR364XX is not set
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_USB_DSBR=m
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 CONFIG_USB_DABUSB=m
 
 #
 # Graphics support
 #
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
-CONFIG_FB_FIRMWARE_EDID=y
+# CONFIG_FB_BACKLIGHT is not set
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_PXA=y
+CONFIG_FB_PXA_LCD_QVGA=y
+# CONFIG_FB_PXA_LCD_VGA is not set
+# CONFIG_FB_PXA_OVERLAY is not set
 # CONFIG_FB_PXA_PARAMETERS is not set
+# CONFIG_FB_MBX is not set
 # CONFIG_FB_W100 is not set
 # CONFIG_FB_VIRTUAL is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_CORGI is not set
+CONFIG_BACKLIGHT_LOCOMO=y
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
 
 #
 # Console display driver support
@@ -1036,6 +1092,7 @@ CONFIG_FB_PXA=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FONTS=y
 # CONFIG_FONT_8x8 is not set
@@ -1048,25 +1105,11 @@ CONFIG_FONT_MINI_4x6=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
-
-#
-# Logo configuration
-#
 CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
 # CONFIG_LOGO_LINUX_CLUT224 is not set
-# CONFIG_LOGO_OHAND_CLUT224 is not set
-CONFIG_LOGO_OZ240_CLUT224=y
-# CONFIG_LOGO_OZ480_CLUT224 is not set
-# CONFIG_LOGO_OZ640_CLUT224 is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_DEVICE=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
-# CONFIG_BACKLIGHT_CORGI is not set
-CONFIG_BACKLIGHT_LOCOMO=y
+CONFIG_LOGO_OHAND_CLUT224=y
 
 #
 # Sound
@@ -1107,6 +1150,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # USB devices
 #
 # CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_CAIAQ is not set
 
 #
 # PCMCIA devices
@@ -1115,54 +1159,41 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_PDAUDIOCF is not set
 
 #
-# SoC audio support
+# System on Chip audio support
 #
 CONFIG_SND_SOC=m
+CONFIG_SND_PXA2XX_SOC=m
+CONFIG_SND_PXA2XX_SOC_I2S=m
+CONFIG_SND_PXA2XX_SOC_POODLE=m
 
 #
-# Soc Platforms
-#
-
-#
-# SoC Audio for the Intel PXA2xx
-#
-CONFIG_SND_PXA2xx_SOC=m
-# CONFIG_SND_PXA2xx_SOC_MAINSTONE is not set
-# CONFIG_SND_PXA2xx_SOC_MAINSTONE_WM8731 is not set
-# CONFIG_SND_PXA2xx_SOC_MAINSTONE_WM8753 is not set
-# CONFIG_SND_PXA2xx_SOC_MAINSTONE_WM8974 is not set
-# CONFIG_SND_PXA2xx_SOC_MAINSTONE_WM9713 is not set
-# CONFIG_SND_MAINSTONE_BASEBAND is not set
-# CONFIG_SND_MAINSTONE_BLUETOOTH is not set
-# CONFIG_SND_PXA2xx_SOC_MAINSTONE_WM9712 is not set
-# CONFIG_SND_PXA2xx_SOC_CORGI is not set
-# CONFIG_SND_PXA2xx_SOC_SPITZ is not set
-CONFIG_SND_PXA2xx_SOC_POODLE=m
-# CONFIG_SND_PXA2xx_SOC_TOSA is not set
-
-#
-# Soc Codecs
+# SoC Audio support for SuperH
 #
-# CONFIG_SND_SOC_AC97_CODEC is not set
 CONFIG_SND_SOC_WM8731=m
-# CONFIG_SND_SOC_WM8750 is not set
-# CONFIG_SND_SOC_WM8753 is not set
-# CONFIG_SND_SOC_WM8772 is not set
-# CONFIG_SND_SOC_WM8971 is not set
-# CONFIG_SND_SOC_WM8974 is not set
-# CONFIG_SND_SOC_WM9713 is not set
-# CONFIG_SND_SOC_WM9712 is not set
-# CONFIG_SND_SOC_UDA1380 is not set
-# CONFIG_SND_SOC_AK4535 is not set
 
 #
 # Open Sound System
 #
 # CONFIG_SOUND_PRIME is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
 
 #
-# USB support
+# USB Input Devices
 #
+CONFIG_USB_HID=m
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -1173,9 +1204,10 @@ CONFIG_USB=m
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_PERSIST is not set
 # CONFIG_USB_OTG is not set
 
 #
@@ -1184,6 +1216,7 @@ CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_CS=m
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
@@ -1209,58 +1242,14 @@ CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_SDDR55 is not set
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
 # CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_KARMA is not set
 # CONFIG_USB_LIBUSUAL is not set
 
 #
-# USB Input Devices
-#
-CONFIG_USB_HID=m
-CONFIG_USB_HIDINPUT=y
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-# CONFIG_HID_FF is not set
-# CONFIG_USB_HIDDEV is not set
-
-#
-# USB HID Boot Protocol drivers
-#
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
-CONFIG_USB_AIPTEK=m
-CONFIG_USB_WACOM=m
-# CONFIG_USB_ACECAD is not set
-CONFIG_USB_KBTAB=m
-CONFIG_USB_POWERMATE=m
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-CONFIG_USB_XPAD=m
-CONFIG_USB_ATI_REMOTE=m
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-
-#
 # USB Imaging devices
 #
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
-# CONFIG_USB_NET_GL620A is not set
-CONFIG_USB_NET_NET1080=m
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-# CONFIG_USB_NET_CDC_SUBSET is not set
-CONFIG_USB_NET_ZAURUS=m
-# CONFIG_USB_ZD1201 is not set
 CONFIG_USB_MON=y
 
 #
@@ -1272,10 +1261,11 @@ CONFIG_USB_MON=y
 #
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y
+# CONFIG_USB_SERIAL_AIRCABLE is not set
 # CONFIG_USB_SERIAL_AIRPRIME is not set
-# CONFIG_USB_SERIAL_ANYDATA is not set
 # CONFIG_USB_SERIAL_ARK3116 is not set
 CONFIG_USB_SERIAL_BELKIN=m
+# CONFIG_USB_SERIAL_CH341 is not set
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
 # CONFIG_USB_SERIAL_CP2101 is not set
@@ -1307,15 +1297,21 @@ CONFIG_USB_SERIAL_KEYSPAN=m
 CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
 # CONFIG_USB_SERIAL_NAVMAN is not set
 CONFIG_USB_SERIAL_PL2303=m
+# CONFIG_USB_SERIAL_OTI6858 is not set
 # CONFIG_USB_SERIAL_HP4X is not set
 CONFIG_USB_SERIAL_SAFE=m
 # CONFIG_USB_SERIAL_SAFE_PADDED is not set
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
 CONFIG_USB_SERIAL_TI=m
 CONFIG_USB_SERIAL_CYBERJACK=m
 CONFIG_USB_SERIAL_XIRCOM=m
+# CONFIG_USB_SERIAL_OPTION is not set
 CONFIG_USB_SERIAL_OMNINET=m
+# CONFIG_USB_SERIAL_DEBUG is not set
 CONFIG_USB_EZUSB=y
 
 #
@@ -1323,16 +1319,22 @@ CONFIG_USB_EZUSB=y
 #
 CONFIG_USB_EMI62=m
 CONFIG_USB_EMI26=m
+# CONFIG_USB_ADUTUX is not set
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_LCD=m
+# CONFIG_USB_BERRY_CHARGE is not set
 CONFIG_USB_LED=m
+# CONFIG_USB_CYPRESS_CY7C63 is not set
 CONFIG_USB_CYTHERM=m
-CONFIG_USB_PHIDGETKIT=m
-CONFIG_USB_PHIDGETSERVO=m
+# CONFIG_USB_PHIDGET is not set
 CONFIG_USB_IDMOUSE=m
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
 # CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
 
 #
@@ -1343,16 +1345,22 @@ CONFIG_USB_IDMOUSE=m
 # USB Gadget Support
 #
 CONFIG_USB_GADGET=y
+# CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_ATMEL_USBA is not set
+# CONFIG_USB_GADGET_FSL_USB2 is not set
 # CONFIG_USB_GADGET_NET2280 is not set
 CONFIG_USB_GADGET_PXA2XX=y
 CONFIG_USB_PXA2XX=y
 # CONFIG_USB_PXA2XX_SMALL is not set
+# CONFIG_USB_GADGET_M66592 is not set
 # CONFIG_USB_GADGET_PXA27X is not set
 # CONFIG_USB_GADGET_GOKU is not set
 # CONFIG_USB_GADGET_LH7A40X is not set
 # CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
 # CONFIG_USB_GADGET_AT91 is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 # CONFIG_USB_GADGET_DUALSPEED is not set
@@ -1363,24 +1371,44 @@ CONFIG_USB_GADGETFS=m
 CONFIG_USB_FILE_STORAGE=m
 # CONFIG_USB_FILE_STORAGE_TEST is not set
 CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_MIDI_GADGET is not set
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_UNSAFE_RESUME=y
 
 #
-# MMC/SD Card support
+# MMC/SD Card Drivers
 #
-CONFIG_MMC=y
-# CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_SDIO_UART is not set
+
+#
+# MMC/SD Host Controller Drivers
+#
 CONFIG_MMC_PXA=y
-CONFIG_MMC_UNSAFE_RESUME=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
 
+#
+# LED drivers
+#
+CONFIG_LEDS_LOCOMO=y
+# CONFIG_LEDS_TOSA is not set
+# CONFIG_LEDS_GPIO is not set
 
 #
-# Real Time Clock
+# LED Triggers
 #
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_IDE_DISK=y
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
 
 #
 # RTC interfaces
@@ -1388,17 +1416,42 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
 
 #
-# RTC drivers
+# I2C RTC drivers
 #
-# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
-CONFIG_RTC_DRV_SA1100=y
-# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_SA1100=m
 
 #
 # File systems
@@ -1406,15 +1459,23 @@ CONFIG_RTC_DRV_SA1100=y
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=m
+CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
@@ -1441,10 +1502,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # Pseudo filesystems
 #
 CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
 
 #
@@ -1457,32 +1519,32 @@ CONFIG_RAMFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
 CONFIG_JFFS2_SUMMARY=y
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_SYSFS is not set
 CONFIG_JFFS2_COMPRESSION_OPTIONS=y
 CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
 CONFIG_JFFS2_RTIME=y
 CONFIG_JFFS2_RUBIN=y
 # CONFIG_JFFS2_CMODE_NONE is not set
 CONFIG_JFFS2_CMODE_PRIORITY=y
 # CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_SQUASHFS_VMALLOC is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
+CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
@@ -1494,6 +1556,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
+# CONFIG_SUNRPC_BIND34 is not set
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 CONFIG_SMB_FS=m
@@ -1501,12 +1564,13 @@ CONFIG_SMB_NLS_DEFAULT=y
 CONFIG_SMB_NLS_REMOTE="cp437"
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
 # CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_EXPERIMENTAL is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1528,10 +1592,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
-
-#
-# Native Language Support
-#
+# CONFIG_SYSV68_PARTITION is not set
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="cp437"
 CONFIG_NLS_CODEPAGE_437=y
@@ -1572,39 +1633,52 @@ CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
 CONFIG_NLS_KOI8_U=m
 CONFIG_NLS_UTF8=y
-
-#
-# Profiling support
-#
+# CONFIG_DLM is not set
+CONFIG_INSTRUMENTATION=y
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
+# CONFIG_MARKERS is not set
 
 #
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_DETECT_SOFTLOCKUP=y
-CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_DETECT_SOFTLOCKUP is not set
+# CONFIG_SCHED_DEBUG is not set
 # CONFIG_SCHEDSTATS is not set
+CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_PREEMPT is not set
-# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
 CONFIG_FRAME_POINTER=y
-# CONFIG_UNWIND_INFO is not set
 # CONFIG_FORCED_INLINING is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_SAMPLES is not set
 # CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 # CONFIG_DEBUG_LL is not set
 
@@ -1613,12 +1687,14 @@ CONFIG_DEBUG_ERRORS=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
 CONFIG_CRYPTO=y
-CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_HMAC=m
+# CONFIG_CRYPTO_XCBC is not set
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
@@ -1627,9 +1703,18 @@ CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_WP512=m
 # CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_XTS is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=m
+# CONFIG_CRYPTO_FCRYPT is not set
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_CAST5=m
@@ -1638,22 +1723,31 @@ CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_ANUBIS=m
+# CONFIG_CRYPTO_SEED is not set
 CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_LZO=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_TEST=m
-
-#
-# Hardware crypto devices
-#
+# CONFIG_CRYPTO_AUTHENC is not set
+CONFIG_CRYPTO_HW=y
 
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=y
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
-# CONFIG_SHARPSL_RC is not set
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-qemuarm b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-qemuarm
index 3a92ff82c..7c4396d61 100644
--- a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-qemuarm
+++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-qemuarm
@@ -1,40 +1,63 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.17
-# Sat Aug 26 22:45:02 2006
+# Linux kernel version: 2.6.24-rc8
+# Sun Jan 20 18:18:09 2008
 #
 CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+# CONFIG_GENERIC_GPIO is not set
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
 CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_FAIR_USER_SCHED=y
+# CONFIG_FAIR_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_UID16=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_EMBEDDED is not set
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -44,28 +67,30 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-CONFIG_OBSOLETE_INTERMODULE=y
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -83,31 +108,47 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # System Type
 #
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+CONFIG_ARCH_VERSATILE=y
+# CONFIG_ARCH_AT91 is not set
 # CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_CO285 is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP3XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_S3C2410 is not set
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP is not set
-CONFIG_ARCH_VERSATILE=y
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91RM9200 is not set
+
+#
+# Boot options
+#
+
+#
+# Power management
+#
 
 #
 # Versatile platform type
@@ -120,11 +161,14 @@ CONFIG_ARCH_VERSATILE_PB=y
 #
 CONFIG_CPU_32=y
 CONFIG_CPU_ARM926T=y
+# CONFIG_CPU_V6 is not set
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5TJ=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_COPY_V4WB=y
 CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
 
 #
 # Processor Features
@@ -134,7 +178,7 @@ CONFIG_ARM_THUMB=y
 # CONFIG_CPU_DCACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
 # CONFIG_CPU_CACHE_ROUND_ROBIN is not set
-# CONFIG_KEXEC is not set
+# CONFIG_OUTER_CACHE is not set
 CONFIG_ARM_VIC=y
 CONFIG_ICST307=y
 
@@ -143,20 +187,23 @@ CONFIG_ICST307=y
 #
 CONFIG_ARM_AMBA=y
 CONFIG_PCI=y
+CONFIG_PCI_SYSCALL=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_PCI_LEGACY=y
 # CONFIG_PCI_DEBUG is not set
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
 # CONFIG_PCCARD is not set
 
 #
 # Kernel Features
 #
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 # CONFIG_PREEMPT is not set
-# CONFIG_NO_IDLE_HZ is not set
 CONFIG_HZ=100
-# CONFIG_AEABI is not set
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -165,9 +212,13 @@ CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_LEDS=y
-CONFIG_LEDS_TIMER=y
 CONFIG_LEDS_CPU=y
 CONFIG_ALIGNMENT_TRAP=y
 
@@ -176,8 +227,10 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2   dyntick=enable debug"
+CONFIG_CMDLINE="console=ttyAMA0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2   dyntick=enable debug"
 # CONFIG_XIP_KERNEL is not set
+CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
 
 #
 # Floating point emulation
@@ -197,7 +250,6 @@ CONFIG_VFP=y
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
-# CONFIG_ARTHUR is not set
 
 #
 # Power management options
@@ -205,7 +257,10 @@ CONFIG_BINFMT_ELF=y
 CONFIG_PM=y
 # CONFIG_PM_LEGACY is not set
 # CONFIG_PM_DEBUG is not set
-# CONFIG_APM is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND_UP_POSSIBLE=y
+CONFIG_SUSPEND=y
+# CONFIG_APM_EMULATION is not set
 
 #
 # Networking
@@ -215,10 +270,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=m
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -238,28 +296,86 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
 # CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
-# CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NF_CONNTRACK_ENABLED is not set
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -270,13 +386,8 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
 # CONFIG_NET_SCHED is not set
 
 #
@@ -286,7 +397,17 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -295,19 +416,14 @@ CONFIG_TCP_CONG_BIC=y
 #
 # Generic Driver Options
 #
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_DEBUG_DRIVER is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -320,11 +436,14 @@ CONFIG_MTD_AFS_PARTS=y
 # User Modules And Translation Layers
 #
 CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -355,7 +474,6 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 
 #
 # Mapping drivers for chip access
@@ -363,6 +481,7 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_PHYSMAP is not set
 # CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
 # CONFIG_MTD_PLATRAM is not set
 
 #
@@ -380,29 +499,15 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
-
-#
-# OneNAND Flash Device Drivers
-#
 # CONFIG_MTD_ONENAND is not set
 
 #
-# Parallel port support
+# UBI - Unsorted block images
 #
+# CONFIG_MTD_UBI is not set
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
@@ -416,15 +521,23 @@ CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=51200
-CONFIG_BLK_DEV_INITRD=y
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
 
 #
 # SCSI device support
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -443,18 +556,18 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
-# SCSI Transport Attributes
+# SCSI Transports
 #
 CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-
-#
-# SCSI low-level drivers
-#
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -463,104 +576,90 @@ CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
 # CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_ARCMSR is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
 # CONFIG_SCSI_IPS is not set
 # CONFIG_SCSI_INITIO is not set
 # CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
 CONFIG_SCSI_SYM53C8XX_2=y
 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
-# CONFIG_SCSI_IPR is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
 # CONFIG_SCSI_LPFC is not set
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
+# CONFIG_SCSI_SRP is not set
+# CONFIG_ATA is not set
 CONFIG_MD=y
+# CONFIG_BLK_DEV_MD is not set
 CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
 CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
-
-#
-# Fusion MPT device support
-#
+# CONFIG_DM_MULTIPATH_RDAC is not set
+# CONFIG_DM_MULTIPATH_HP is not set
+# CONFIG_DM_DELAY is not set
+# CONFIG_DM_UEVENT is not set
 # CONFIG_FUSION is not set
-# CONFIG_FUSION_SPI is not set
-# CONFIG_FUSION_FC is not set
-# CONFIG_FUSION_SAS is not set
 
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
-
-#
-# ARCnet devices
-#
+# CONFIG_VETH is not set
 # CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
+# CONFIG_AX88796 is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NET_VENDOR_3COM is not set
 CONFIG_SMC91X=y
 # CONFIG_DM9000 is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
 # CONFIG_NET_PCI is not set
-
-#
-# Ethernet (1000 Mbit)
-#
+# CONFIG_B44 is not set
+CONFIG_NETDEV_1000=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_IP1000 is not set
 # CONFIG_NS83820 is not set
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
@@ -569,29 +668,38 @@ CONFIG_SMC91X=y
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 # CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
-
-#
-# Ethernet (10000 Mbit)
-#
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+CONFIG_NETDEV_10000=y
 # CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_IXGBE is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
-
-#
-# Token Ring devices
-#
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_NIU is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_TEHUTI is not set
 # CONFIG_TR is not set
 
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
 #
-# CONFIG_NET_RADIO is not set
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 
 #
-# Wan interfaces
+# USB Network Adapters
 #
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -602,26 +710,22 @@ CONFIG_SMC91X=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
 
 #
 # Input device support
 #
 CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
 #
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_POWER is not set
 
 #
 # Input Device Drivers
@@ -632,13 +736,22 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+CONFIG_INPUT_TABLET=y
+# CONFIG_TABLET_USB_ACECAD is not set
+# CONFIG_TABLET_USB_AIPTEK is not set
+# CONFIG_TABLET_USB_GTCO is not set
+# CONFIG_TABLET_USB_KBTAB is not set
+CONFIG_TABLET_USB_WACOM=y
 # CONFIG_INPUT_TOUCHSCREEN is not set
 CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_UINPUT is not set
 
 #
@@ -658,6 +771,7 @@ CONFIG_SERIO_LIBPS2=y
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
@@ -675,36 +789,14 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=m
 # CONFIG_NVRAM is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
-
-#
-# I2C support
-#
+CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
 
 #
@@ -712,42 +804,37 @@ CONFIG_UNIX98_PTYS=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_I5K_AMB is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
+# CONFIG_WATCHDOG is not set
 
 #
-# Misc devices
-#
-
-#
-# Multi-Function Devices
+# Sonics Silicon Backplane
 #
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
 
 #
-# LED devices
+# Multifunction device drivers
 #
-CONFIG_NEW_LEDS=y
-# CONFIG_LEDS_CLASS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-# CONFIG_LEDS_TRIGGERS is not set
+# CONFIG_MFD_SM501 is not set
 
 #
 # Multimedia devices
@@ -756,24 +843,62 @@ CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L1=y
 CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_VIDEO_V4L2=y
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+# CONFIG_VIDEO_VIVI is not set
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_CPIA2 is not set
+# CONFIG_VIDEO_STRADIS is not set
+CONFIG_V4L_USB_DRIVERS=y
+# CONFIG_USB_VICAM is not set
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_KONICAWC is not set
+# CONFIG_USB_QUICKCAM_MESSENGER is not set
+# CONFIG_USB_ET61X251 is not set
+# CONFIG_USB_OV511 is not set
+# CONFIG_USB_SE401 is not set
+# CONFIG_USB_SN9C102 is not set
+# CONFIG_USB_STV680 is not set
+# CONFIG_USB_ZC0301 is not set
+# CONFIG_USB_PWC is not set
+# CONFIG_USB_ZR364XX is not set
+CONFIG_RADIO_ADAPTERS=y
+# CONFIG_RADIO_GEMTEK_PCI is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_MAESTRO is not set
+# CONFIG_USB_DSBR is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 # CONFIG_USB_DABUSB is not set
 
 #
 # Graphics support
 #
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
-CONFIG_FB_FIRMWARE_EDID=y
+# CONFIG_FB_BACKLIGHT is not set
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_PM2 is not set
 CONFIG_FB_ARMCLCD=y
@@ -787,46 +912,58 @@ CONFIG_FB_ARMCLCD=y
 # CONFIG_FB_RADEON is not set
 # CONFIG_FB_ATY128 is not set
 # CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
 # CONFIG_FB_SAVAGE is not set
 # CONFIG_FB_SIS is not set
 # CONFIG_FB_NEOMAGIC is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 # CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
 # CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
 # CONFIG_FB_VIRTUAL is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
 
 #
 # Console display driver support
 #
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
-
-#
-# Logo configuration
-#
 CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
 # CONFIG_LOGO_LINUX_CLUT224 is not set
 CONFIG_LOGO_OHAND_CLUT224=y
-# CONFIG_LOGO_OZ240_CLUT224 is not set
-# CONFIG_LOGO_OZ480_CLUT224 is not set
-# CONFIG_LOGO_OZ640_CLUT224 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
 #
 # CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
 
 #
-# USB support
+# USB Input Devices
 #
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -837,9 +974,10 @@ CONFIG_USB=y
 # Miscellaneous USB options
 #
 # CONFIG_USB_DEVICEFS is not set
-# CONFIG_USB_BANDWIDTH is not set
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_PERSIST is not set
 # CONFIG_USB_OTG is not set
 
 #
@@ -848,10 +986,12 @@ CONFIG_USB=y
 # CONFIG_USB_EHCI_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
@@ -870,42 +1010,10 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_LIBUSUAL is not set
 
 #
-# USB Input Devices
-#
-CONFIG_USB_HID=y
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_AIPTEK is not set
-CONFIG_USB_WACOM=y
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET is not set
 CONFIG_USB_MON=y
 
 #
@@ -922,16 +1030,22 @@ CONFIG_USB_MON=y
 #
 # CONFIG_USB_EMI62 is not set
 # CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
 # CONFIG_USB_AUERSWALD is not set
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
 # CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_PHIDGETKIT is not set
-# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_PHIDGET is not set
 # CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
 # CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
 
 #
 # USB DSL modem support
@@ -941,19 +1055,23 @@ CONFIG_USB_MON=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+CONFIG_NEW_LEDS=y
+# CONFIG_LEDS_CLASS is not set
 
 #
-# MMC/SD Card support
+# LED drivers
 #
-# CONFIG_MMC is not set
 
 #
-# Real Time Clock
+# LED Triggers
 #
+# CONFIG_LEDS_TRIGGERS is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
 
 #
 # RTC interfaces
@@ -961,12 +1079,28 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
 
 #
-# RTC drivers
+# SPI RTC drivers
 #
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_RTC_DRV_PL031 is not set
 
 #
 # File systems
@@ -974,15 +1108,23 @@ CONFIG_RTC_INTF_DEV=y
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=m
+CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
@@ -1006,10 +1148,11 @@ CONFIG_DNOTIFY=y
 # Pseudo filesystems
 #
 CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
 
 #
@@ -1022,13 +1165,16 @@ CONFIG_RAMFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
 # CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_SYSFS is not set
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set
 CONFIG_CRAMFS=y
@@ -1038,10 +1184,7 @@ CONFIG_CRAMFS=y
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
+CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
@@ -1058,6 +1201,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 CONFIG_SMB_FS=y
@@ -1066,7 +1210,6 @@ CONFIG_SMB_FS=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1088,10 +1231,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
-
-#
-# Native Language Support
-#
+# CONFIG_SYSV68_PARTITION is not set
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_CODEPAGE_437 is not set
@@ -1132,38 +1272,51 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NLS_KOI8_U is not set
 # CONFIG_NLS_UTF8 is not set
-
-#
-# Profiling support
-#
+# CONFIG_DLM is not set
+CONFIG_INSTRUMENTATION=y
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
+# CONFIG_MARKERS is not set
 
 #
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
-CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_SHIRQ is not set
 CONFIG_DETECT_SOFTLOCKUP=y
-CONFIG_TIMER_STATS=y
+CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
+CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
 CONFIG_FRAME_POINTER=y
-# CONFIG_UNWIND_INFO is not set
 CONFIG_FORCED_INLINING=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_SAMPLES is not set
 # CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 # CONFIG_DEBUG_LL is not set
 
@@ -1172,23 +1325,63 @@ CONFIG_DEBUG_ERRORS=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-# CONFIG_CRYPTO is not set
-
-#
-# Hardware crypto devices
-#
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_MANAGER=m
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_XTS is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+CONFIG_CRYPTO_HW=y
 
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
-# CONFIG_SHARPSL_RC is not set
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-qemux86 b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-qemux86
index df5cd53ae..bfedf91d4 100644
--- a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-qemux86
+++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-qemux86
@@ -1,45 +1,83 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.17
-# Mon Oct 16 19:42:42 2006
+# Linux kernel version: 2.6.24-rc8
+# Sun Jan 20 18:20:37 2008
 #
+# CONFIG_64BIT is not set
 CONFIG_X86_32=y
-CONFIG_SEMAPHORE_SLEEPERS=y
+# CONFIG_X86_64 is not set
 CONFIG_X86=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_SEMAPHORE_SLEEPERS=y
 CONFIG_MMU=y
+CONFIG_ZONE_DMA=y
+CONFIG_QUICKLIST=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_DMI=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+# CONFIG_GENERIC_TIME_VSYSCALL is not set
+CONFIG_ARCH_SUPPORTS_OPROFILE=y
+# CONFIG_ZONE_DMA32 is not set
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+# CONFIG_AUDIT_ARCH is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_X86_SMP=y
+CONFIG_X86_HT=y
+CONFIG_X86_BIOS_REBOOT=y
+CONFIG_X86_TRAMPOLINE=y
+CONFIG_KTIME_SCALAR=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_TREE=y
 # CONFIG_IKCONFIG is not set
-# CONFIG_CPUSETS is not set
+CONFIG_LOG_BUF_SHIFT=15
+# CONFIG_CGROUPS is not set
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_FAIR_USER_SCHED=y
+# CONFIG_FAIR_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_UID16=y
-CONFIG_VM86=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
@@ -48,28 +86,30 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 # CONFIG_MODULE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
 CONFIG_LBD=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -87,6 +127,10 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # Processor type and features
 #
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_SMP=y
 CONFIG_X86_PC=y
 # CONFIG_X86_ELAN is not set
@@ -97,6 +141,9 @@ CONFIG_X86_PC=y
 # CONFIG_X86_VISWS is not set
 # CONFIG_X86_GENERICARCH is not set
 # CONFIG_X86_ES7000 is not set
+# CONFIG_X86_VSMP is not set
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+# CONFIG_PARAVIRT_GUEST is not set
 CONFIG_M386=y
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set
@@ -119,13 +166,17 @@ CONFIG_M386=y
 # CONFIG_MGEODE_LX is not set
 # CONFIG_MCYRIXIII is not set
 # CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_GENERIC_CPU is not set
 CONFIG_X86_GENERIC=y
+# CONFIG_X86_CMPXCHG is not set
 CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_X86_PPRO_FENCE=y
 CONFIG_X86_F00F_BUG=y
 CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=3
 # CONFIG_HPET_TIMER is not set
 CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
@@ -139,23 +190,23 @@ CONFIG_X86_IO_APIC=y
 CONFIG_X86_MCE=y
 CONFIG_X86_MCE_NONFATAL=y
 CONFIG_X86_MCE_P4THERMAL=y
+CONFIG_VM86=y
 # CONFIG_TOSHIBA is not set
 # CONFIG_I8K is not set
 # CONFIG_X86_REBOOTFIXUPS is not set
 # CONFIG_MICROCODE is not set
 # CONFIG_X86_MSR is not set
 # CONFIG_X86_CPUID is not set
-
-#
-# Firmware Drivers
-#
-# CONFIG_EDD is not set
-# CONFIG_DELL_RBU is not set
-# CONFIG_DCDBAS is not set
 CONFIG_NOHIGHMEM=y
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_3G_OPT is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_2G_OPT is not set
+# CONFIG_VMSPLIT_1G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
+# CONFIG_X86_PAE is not set
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -166,43 +217,57 @@ CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPARSEMEM_STATIC=y
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_NR_QUICK=1
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
 # CONFIG_EFI is not set
 CONFIG_IRQBALANCE=y
-# CONFIG_REGPARM is not set
 CONFIG_SECCOMP=y
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
-# CONFIG_KEXEC is not set
+CONFIG_KEXEC=y
 CONFIG_PHYSICAL_START=0x100000
-# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x100000
+CONFIG_HOTPLUG_CPU=y
+CONFIG_COMPAT_VDSO=y
 
 #
-# Power management options (ACPI, APM)
+# Power management options
 #
 CONFIG_PM=y
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_DEBUG is not set
-
-#
-# ACPI (Advanced Configuration and Power Interface) Support
-#
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND_SMP_POSSIBLE=y
+CONFIG_SUSPEND=y
+CONFIG_HIBERNATION_SMP_POSSIBLE=y
+# CONFIG_HIBERNATION is not set
 CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+# CONFIG_ACPI_PROCFS is not set
+CONFIG_ACPI_PROCFS_POWER=y
+CONFIG_ACPI_SYSFS_POWER=y
+CONFIG_ACPI_PROC_EVENT=y
 CONFIG_ACPI_AC=y
 CONFIG_ACPI_BATTERY=y
 CONFIG_ACPI_BUTTON=y
-CONFIG_ACPI_VIDEO=m
-# CONFIG_ACPI_HOTKEY is not set
 CONFIG_ACPI_FAN=y
+# CONFIG_ACPI_DOCK is not set
 CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_THERMAL=y
 # CONFIG_ACPI_ASUS is not set
-CONFIG_ACPI_IBM=m
-# CONFIG_ACPI_IBM_DOCK is not set
 # CONFIG_ACPI_TOSHIBA is not set
 CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
@@ -210,20 +275,18 @@ CONFIG_ACPI_EC=y
 CONFIG_ACPI_POWER=y
 CONFIG_ACPI_SYSTEM=y
 CONFIG_X86_PM_TIMER=y
-# CONFIG_ACPI_CONTAINER is not set
-
-#
-# APM (Advanced Power Management) BIOS Support
-#
+CONFIG_ACPI_CONTAINER=y
+# CONFIG_ACPI_SBS is not set
 # CONFIG_APM is not set
 
 #
 # CPU Frequency scaling
 #
 # CONFIG_CPU_FREQ is not set
+# CONFIG_CPU_IDLE is not set
 
 #
-# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
+# Bus options (PCI etc.)
 #
 CONFIG_PCI=y
 # CONFIG_PCI_GOBIOS is not set
@@ -233,26 +296,22 @@ CONFIG_PCI_GOANY=y
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
+CONFIG_PCI_LEGACY=y
+CONFIG_HT_IRQ=y
 CONFIG_ISA_DMA_API=y
 CONFIG_ISA=y
 # CONFIG_EISA is not set
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
 # CONFIG_PCCARD is not set
-
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 
 #
-# Executable file formats
+# Executable file formats / Emulations
 #
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_AOUT=y
@@ -266,10 +325,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=m
-CONFIG_PACKET_MMAP=y
+# CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -289,18 +351,21 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
 # CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
-
-#
-# IP: Virtual Server Configuration
-#
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
 
@@ -308,38 +373,64 @@ CONFIG_NETFILTER=y
 # Core Netfilter Configuration
 #
 # CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NETFILTER_XTABLES is not set
+# CONFIG_NF_CONNTRACK_ENABLED is not set
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
 
 #
 # IP: Netfilter Configuration
 #
-CONFIG_IP_NF_CONNTRACK=y
-# CONFIG_IP_NF_CT_ACCT is not set
-# CONFIG_IP_NF_CONNTRACK_MARK is not set
-# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-# CONFIG_IP_NF_CT_PROTO_SCTP is not set
-# CONFIG_IP_NF_FTP is not set
-# CONFIG_IP_NF_IRC is not set
-# CONFIG_IP_NF_NETBIOS_NS is not set
-# CONFIG_IP_NF_TFTP is not set
-# CONFIG_IP_NF_AMANDA is not set
-# CONFIG_IP_NF_PPTP is not set
-# CONFIG_IP_NF_H323 is not set
-CONFIG_IP_NF_QUEUE=y
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -350,13 +441,8 @@ CONFIG_IP_NF_QUEUE=y
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
 # CONFIG_NET_SCHED is not set
 
 #
@@ -366,7 +452,17 @@ CONFIG_IP_NF_QUEUE=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -375,34 +471,22 @@ CONFIG_IP_NF_QUEUE=y
 #
 # Generic Driver Options
 #
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=m
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
-# CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
 # CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
 CONFIG_PARPORT=y
 CONFIG_PARPORT_PC=y
 # CONFIG_PARPORT_SERIAL is not set
 # CONFIG_PARPORT_PC_FIFO is not set
 # CONFIG_PARPORT_PC_SUPERIO is not set
 # CONFIG_PARPORT_GSC is not set
+# CONFIG_PARPORT_AX88796 is not set
 # CONFIG_PARPORT_1284 is not set
-
-#
-# Plug and Play support
-#
 CONFIG_PNP=y
 # CONFIG_PNP_DEBUG is not set
 
@@ -412,10 +496,7 @@ CONFIG_PNP=y
 # CONFIG_ISAPNP is not set
 # CONFIG_PNPBIOS is not set
 CONFIG_PNPACPI=y
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_FD=y
 # CONFIG_BLK_DEV_XD is not set
 # CONFIG_PARIDE is not set
@@ -431,14 +512,19 @@ CONFIG_BLK_DEV_FD=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=51200
-CONFIG_BLK_DEV_INITRD=y
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+CONFIG_MISC_DEVICES=y
+# CONFIG_IBM_ASM is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_SONY_LAPTOP is not set
+# CONFIG_THINKPAD_ACPI is not set
 CONFIG_IDE=y
+CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
 
 #
@@ -452,25 +538,30 @@ CONFIG_BLK_DEV_IDECD=y
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
+# CONFIG_BLK_DEV_IDEACPI is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 
 #
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_GENERIC=y
+# CONFIG_BLK_DEV_PLATFORM is not set
 CONFIG_BLK_DEV_CMD640=y
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 # CONFIG_BLK_DEV_IDEPNP is not set
+
+#
+# PCI IDE chipsets support
+#
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
+CONFIG_IDEPCI_PCIBUS_ORDER=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=y
 # CONFIG_BLK_DEV_OPTI621 is not set
 CONFIG_BLK_DEV_RZ1000=y
 CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-CONFIG_IDEDMA_PCI_AUTO=y
-# CONFIG_IDEDMA_ONLYDISK is not set
 # CONFIG_BLK_DEV_AEC62XX is not set
 # CONFIG_BLK_DEV_ALI15X3 is not set
 # CONFIG_BLK_DEV_AMD74XX is not set
@@ -483,8 +574,10 @@ CONFIG_IDEDMA_PCI_AUTO=y
 # CONFIG_BLK_DEV_CS5535 is not set
 # CONFIG_BLK_DEV_HPT34X is not set
 # CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_JMICRON is not set
 # CONFIG_BLK_DEV_SC1200 is not set
 CONFIG_BLK_DEV_PIIX=y
+# CONFIG_BLK_DEV_IT8213 is not set
 # CONFIG_BLK_DEV_IT821X is not set
 # CONFIG_BLK_DEV_NS87415 is not set
 # CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -495,11 +588,24 @@ CONFIG_BLK_DEV_PIIX=y
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
 # CONFIG_IDE_ARM is not set
-# CONFIG_IDE_CHIPSETS is not set
+
+#
+# Other IDE chipsets support
+#
+
+#
+# Note: most of these also require special kernel boot parameters
+#
+# CONFIG_BLK_DEV_4DRIVES is not set
+# CONFIG_BLK_DEV_ALI14XX is not set
+# CONFIG_BLK_DEV_DTC2278 is not set
+# CONFIG_BLK_DEV_HT6560B is not set
+# CONFIG_BLK_DEV_QD65XX is not set
+# CONFIG_BLK_DEV_UMC8672 is not set
 CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_IVB is not set
-CONFIG_IDEDMA_AUTO=y
+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -507,6 +613,9 @@ CONFIG_IDEDMA_AUTO=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -525,18 +634,18 @@ CONFIG_CHR_DEV_SG=y
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
-# SCSI Transport Attributes
+# SCSI Transports
 #
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-
-#
-# SCSI low-level drivers
-#
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_3W_9XXX is not set
@@ -548,29 +657,15 @@ CONFIG_CHR_DEV_SG=y
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
 CONFIG_SCSI_DPT_I2O=m
 # CONFIG_SCSI_ADVANSYS is not set
 # CONFIG_SCSI_IN2000 is not set
+# CONFIG_SCSI_ARCMSR is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
-CONFIG_SCSI_SATA=y
-# CONFIG_SCSI_SATA_AHCI is not set
-# CONFIG_SCSI_SATA_SVW is not set
-CONFIG_SCSI_ATA_PIIX=y
-# CONFIG_SCSI_SATA_MV is not set
-# CONFIG_SCSI_SATA_NV is not set
-# CONFIG_SCSI_PDC_ADMA is not set
-# CONFIG_SCSI_SATA_QSTOR is not set
-# CONFIG_SCSI_SATA_PROMISE is not set
-CONFIG_SCSI_SATA_SX4=m
-# CONFIG_SCSI_SATA_SIL is not set
-# CONFIG_SCSI_SATA_SIL24 is not set
-CONFIG_SCSI_SATA_SIS=m
-# CONFIG_SCSI_SATA_ULI is not set
-# CONFIG_SCSI_SATA_VIA is not set
-# CONFIG_SCSI_SATA_VITESSE is not set
-CONFIG_SCSI_SATA_INTEL_COMBINED=y
+# CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_DTC3280 is not set
@@ -585,16 +680,16 @@ CONFIG_SCSI_SATA_INTEL_COMBINED=y
 # CONFIG_SCSI_PPA is not set
 # CONFIG_SCSI_IMM is not set
 # CONFIG_SCSI_NCR53C406A is not set
+# CONFIG_SCSI_STEX is not set
 # CONFIG_SCSI_SYM53C8XX_2 is not set
-CONFIG_SCSI_IPR=m
-# CONFIG_SCSI_IPR_TRACE is not set
-# CONFIG_SCSI_IPR_DUMP is not set
 # CONFIG_SCSI_PAS16 is not set
 # CONFIG_SCSI_PSI240I is not set
 # CONFIG_SCSI_QLOGIC_FAS is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
 # CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_SEAGATE is not set
 # CONFIG_SCSI_SYM53C416 is not set
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_DC390T is not set
@@ -603,47 +698,37 @@ CONFIG_SCSI_IPR=m
 # CONFIG_SCSI_ULTRASTOR is not set
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
-
-#
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
+# CONFIG_SCSI_SRP is not set
+# CONFIG_ATA is not set
 CONFIG_MD=y
+# CONFIG_BLK_DEV_MD is not set
 CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
 CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
-
-#
-# Fusion MPT device support
-#
+# CONFIG_DM_MULTIPATH_RDAC is not set
+# CONFIG_DM_MULTIPATH_HP is not set
+# CONFIG_DM_DELAY is not set
+# CONFIG_DM_UEVENT is not set
 # CONFIG_FUSION is not set
-# CONFIG_FUSION_SPI is not set
-# CONFIG_FUSION_FC is not set
-# CONFIG_FUSION_SAS is not set
 
 #
 # IEEE 1394 (FireWire) support
 #
+# CONFIG_FIREWIRE is not set
 CONFIG_IEEE1394=y
 
 #
 # Subsystem Options
 #
 # CONFIG_IEEE1394_VERBOSEDEBUG is not set
-# CONFIG_IEEE1394_OUI_DB is not set
-# CONFIG_IEEE1394_EXTRA_CONFIG_ROMS is not set
-# CONFIG_IEEE1394_EXPORT_FULL_API is not set
 
 #
-# Device Drivers
+# Controllers
 #
 
 #
@@ -652,42 +737,27 @@ CONFIG_IEEE1394=y
 CONFIG_IEEE1394_OHCI1394=y
 
 #
-# Protocol Drivers
+# Protocols
 #
 # CONFIG_IEEE1394_VIDEO1394 is not set
 # CONFIG_IEEE1394_SBP2 is not set
+# CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set
 # CONFIG_IEEE1394_ETH1394 is not set
 # CONFIG_IEEE1394_DV1394 is not set
 CONFIG_IEEE1394_RAWIO=y
-
-#
-# I2O device support
-#
 # CONFIG_I2O is not set
-
-#
-# Network device support
-#
+# CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 CONFIG_DUMMY=m
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
+# CONFIG_VETH is not set
 # CONFIG_NET_SB1000 is not set
-
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
@@ -697,10 +767,6 @@ CONFIG_MII=y
 # CONFIG_LANCE is not set
 # CONFIG_NET_VENDOR_SMC is not set
 # CONFIG_NET_VENDOR_RACAL is not set
-
-#
-# Tulip family network device support
-#
 # CONFIG_NET_TULIP is not set
 # CONFIG_AT1700 is not set
 # CONFIG_DEPCA is not set
@@ -717,6 +783,10 @@ CONFIG_NET_ISA=y
 CONFIG_NE2000=y
 # CONFIG_ZNET is not set
 # CONFIG_SEEQ8005 is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
 CONFIG_NET_PCI=y
 # CONFIG_PCNET32 is not set
 # CONFIG_AMD8111_ETH is not set
@@ -726,7 +796,6 @@ CONFIG_NET_PCI=y
 # CONFIG_B44 is not set
 # CONFIG_FORCEDETH is not set
 # CONFIG_CS89x0 is not set
-# CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 # CONFIG_E100 is not set
 # CONFIG_FEALNX is not set
@@ -743,14 +812,14 @@ CONFIG_8139TOO_PIO=y
 # CONFIG_SUNDANCE is not set
 # CONFIG_TLAN is not set
 # CONFIG_VIA_RHINE is not set
+# CONFIG_SC92031 is not set
 # CONFIG_NET_POCKET is not set
-
-#
-# Ethernet (1000 Mbit)
-#
+CONFIG_NETDEV_1000=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_IP1000 is not set
 # CONFIG_NS83820 is not set
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
@@ -762,28 +831,36 @@ CONFIG_8139TOO_PIO=y
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
-
-#
-# Ethernet (10000 Mbit)
-#
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+CONFIG_NETDEV_10000=y
 # CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_IXGBE is not set
 # CONFIG_IXGB is not set
 CONFIG_S2IO=m
 # CONFIG_S2IO_NAPI is not set
-
-#
-# Token Ring devices
-#
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_NIU is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_TEHUTI is not set
 # CONFIG_TR is not set
 
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
 #
-# CONFIG_NET_RADIO is not set
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 
 #
-# Wan interfaces
+# USB Network Adapters
 #
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -795,31 +872,23 @@ CONFIG_S2IO=m
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
 # CONFIG_PHONE is not set
 
 #
 # Input device support
 #
 CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
 #
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_POWER is not set
 
 #
 # Input Device Drivers
@@ -830,14 +899,15 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_INPUT_MOUSE is not set
-# CONFIG_MOUSE_PS2 is not set
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-# CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_INPUT_JOYSTICK is not set
+CONFIG_INPUT_TABLET=y
+# CONFIG_TABLET_USB_ACECAD is not set
+# CONFIG_TABLET_USB_AIPTEK is not set
+# CONFIG_TABLET_USB_GTCO is not set
+# CONFIG_TABLET_USB_KBTAB is not set
+CONFIG_TABLET_USB_WACOM=y
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
 
@@ -860,6 +930,7 @@ CONFIG_SERIO_LIBPS2=y
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
@@ -867,6 +938,7 @@ CONFIG_HW_CONSOLE=y
 #
 CONFIG_SERIAL_8250=y
 # CONFIG_SERIAL_8250_CONSOLE is not set
+CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_PNP=y
 CONFIG_SERIAL_8250_NR_UARTS=4
@@ -883,17 +955,7 @@ CONFIG_UNIX98_PTYS=y
 CONFIG_PRINTER=y
 # CONFIG_LP_CONSOLE is not set
 # CONFIG_PPDEV is not set
-# CONFIG_TIPAR is not set
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_NVRAM is not set
 # CONFIG_RTC is not set
@@ -902,47 +964,16 @@ CONFIG_PRINTER=y
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_SONYPI is not set
-
-#
-# Ftape, the floppy tape device driver
-#
-CONFIG_AGP=y
-# CONFIG_AGP_ALI is not set
-# CONFIG_AGP_ATI is not set
-# CONFIG_AGP_AMD is not set
-# CONFIG_AGP_AMD64 is not set
-CONFIG_AGP_INTEL=y
-# CONFIG_AGP_NVIDIA is not set
-# CONFIG_AGP_SIS is not set
-# CONFIG_AGP_SWORKS is not set
-# CONFIG_AGP_VIA is not set
-# CONFIG_AGP_EFFICEON is not set
-CONFIG_DRM=y
-# CONFIG_DRM_TDFX is not set
-# CONFIG_DRM_R128 is not set
-# CONFIG_DRM_RADEON is not set
-# CONFIG_DRM_I810 is not set
-# CONFIG_DRM_I830 is not set
-# CONFIG_DRM_I915 is not set
-# CONFIG_DRM_MGA is not set
-# CONFIG_DRM_SIS is not set
-# CONFIG_DRM_VIA is not set
-# CONFIG_DRM_SAVAGE is not set
 # CONFIG_MWAVE is not set
+# CONFIG_PC8736x_GPIO is not set
+# CONFIG_NSC_GPIO is not set
 # CONFIG_CS5535_GPIO is not set
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_HPET is not set
 # CONFIG_HANGCHECK_TIMER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 # CONFIG_TELCLOCK is not set
-
-#
-# I2C support
-#
+CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
 
 #
@@ -950,29 +981,46 @@ CONFIG_DRM=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PDA_POWER is not set
+# CONFIG_BATTERY_DS2760 is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
+# CONFIG_SENSORS_K8TEMP is not set
+# CONFIG_SENSORS_I5K_AMB is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_CORETEMP is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_SENSORS_HDAPS is not set
+# CONFIG_SENSORS_APPLESMC is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
+# CONFIG_WATCHDOG is not set
 
 #
-# Misc devices
+# Sonics Silicon Backplane
 #
-# CONFIG_IBM_ASM is not set
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
 
 #
-# Multi-Function Devices
+# Multifunction device drivers
 #
+# CONFIG_MFD_SM501 is not set
 
 #
 # Multimedia devices
@@ -981,65 +1029,150 @@ CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L1=y
 CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_VIDEO_V4L2=y
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+# CONFIG_VIDEO_VIVI is not set
+# CONFIG_VIDEO_PMS is not set
+# CONFIG_VIDEO_BWQCAM is not set
+# CONFIG_VIDEO_CQCAM is not set
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_CPIA2 is not set
+# CONFIG_VIDEO_STRADIS is not set
+CONFIG_V4L_USB_DRIVERS=y
+# CONFIG_USB_VICAM is not set
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_KONICAWC is not set
+# CONFIG_USB_QUICKCAM_MESSENGER is not set
+# CONFIG_USB_ET61X251 is not set
+# CONFIG_USB_OV511 is not set
+# CONFIG_USB_SE401 is not set
+# CONFIG_USB_SN9C102 is not set
+# CONFIG_USB_STV680 is not set
+# CONFIG_USB_ZC0301 is not set
+# CONFIG_USB_PWC is not set
+# CONFIG_USB_ZR364XX is not set
+CONFIG_RADIO_ADAPTERS=y
+# CONFIG_RADIO_CADET is not set
+# CONFIG_RADIO_RTRACK is not set
+# CONFIG_RADIO_RTRACK2 is not set
+# CONFIG_RADIO_AZTECH is not set
+# CONFIG_RADIO_GEMTEK is not set
+# CONFIG_RADIO_GEMTEK_PCI is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_MAESTRO is not set
+# CONFIG_RADIO_SF16FMI is not set
+# CONFIG_RADIO_SF16FMR2 is not set
+# CONFIG_RADIO_TERRATEC is not set
+# CONFIG_RADIO_TRUST is not set
+# CONFIG_RADIO_TYPHOON is not set
+# CONFIG_RADIO_ZOLTRIX is not set
+# CONFIG_USB_DSBR is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 # CONFIG_USB_DABUSB is not set
 
 #
 # Graphics support
 #
+CONFIG_AGP=y
+# CONFIG_AGP_ALI is not set
+# CONFIG_AGP_ATI is not set
+# CONFIG_AGP_AMD is not set
+# CONFIG_AGP_AMD64 is not set
+CONFIG_AGP_INTEL=y
+# CONFIG_AGP_NVIDIA is not set
+# CONFIG_AGP_SIS is not set
+# CONFIG_AGP_SWORKS is not set
+# CONFIG_AGP_VIA is not set
+# CONFIG_AGP_EFFICEON is not set
+CONFIG_DRM=y
+# CONFIG_DRM_TDFX is not set
+# CONFIG_DRM_R128 is not set
+# CONFIG_DRM_RADEON is not set
+# CONFIG_DRM_I810 is not set
+# CONFIG_DRM_I830 is not set
+# CONFIG_DRM_I915 is not set
+# CONFIG_DRM_MGA is not set
+# CONFIG_DRM_SIS is not set
+# CONFIG_DRM_VIA is not set
+# CONFIG_DRM_SAVAGE is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+CONFIG_FB_CFB_FILLRECT=m
+CONFIG_FB_CFB_COPYAREA=m
+CONFIG_FB_CFB_IMAGEBLIT=m
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
-CONFIG_FB_FIRMWARE_EDID=y
+# CONFIG_FB_BACKLIGHT is not set
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_PM2 is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_ARC is not set
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=y
-CONFIG_FB_VESA=y
-# CONFIG_FB_VESA_STD is not set
-CONFIG_FB_VESA_TNG=y
-CONFIG_FB_VESA_DEFAULT_MODE="640x480-32@60"
-CONFIG_VIDEO_SELECT=y
+# CONFIG_FB_VGA16 is not set
+CONFIG_FB_UVESA=m
+# CONFIG_FB_VESA is not set
+# CONFIG_FB_EFI is not set
+# CONFIG_FB_HECUBA is not set
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_RIVA is not set
 # CONFIG_FB_I810 is not set
+# CONFIG_FB_LE80578 is not set
 # CONFIG_FB_INTEL is not set
 # CONFIG_FB_MATROX is not set
 # CONFIG_FB_RADEON is not set
 # CONFIG_FB_ATY128 is not set
 # CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
 # CONFIG_FB_SAVAGE is not set
 # CONFIG_FB_SIS is not set
 # CONFIG_FB_NEOMAGIC is not set
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 # CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
 # CONFIG_FB_CYBLA is not set
 # CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_VIRTUAL is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
 
 #
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
+CONFIG_VIDEO_SELECT=y
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
@@ -1052,19 +1185,11 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
-
-#
-# Logo configuration
-#
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
 # CONFIG_LOGO_LINUX_CLUT224 is not set
 CONFIG_LOGO_OHAND_CLUT224=y
-# CONFIG_LOGO_OZ240_CLUT224 is not set
-# CONFIG_LOGO_OZ480_CLUT224 is not set
-# CONFIG_LOGO_OZ640_CLUT224 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
@@ -1094,12 +1219,13 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # Generic devices
 #
 CONFIG_SND_AC97_CODEC=y
-CONFIG_SND_AC97_BUS=y
 # CONFIG_SND_DUMMY is not set
 # CONFIG_SND_VIRMIDI is not set
 # CONFIG_SND_MTPAV is not set
+# CONFIG_SND_MTS64 is not set
 # CONFIG_SND_SERIAL_U16550 is not set
 # CONFIG_SND_MPU401 is not set
+# CONFIG_SND_PORTMAN2X4 is not set
 
 #
 # ISA devices
@@ -1117,6 +1243,7 @@ CONFIG_SND_AC97_BUS=y
 # CONFIG_SND_ES968 is not set
 # CONFIG_SND_ES1688 is not set
 # CONFIG_SND_ES18XX is not set
+# CONFIG_SND_SC6000 is not set
 # CONFIG_SND_GUSCLASSIC is not set
 # CONFIG_SND_GUSEXTREME is not set
 # CONFIG_SND_GUSMAX is not set
@@ -1152,7 +1279,20 @@ CONFIG_SND_AC97_BUS=y
 # CONFIG_SND_CMIPCI is not set
 # CONFIG_SND_CS4281 is not set
 # CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
 # CONFIG_SND_CS5535AUDIO is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
 # CONFIG_SND_EMU10K1 is not set
 # CONFIG_SND_EMU10K1X is not set
 # CONFIG_SND_ENS1370 is not set
@@ -1182,26 +1322,42 @@ CONFIG_SND_INTEL8X0=y
 # CONFIG_SND_VIA82XX_MODEM is not set
 # CONFIG_SND_VX222 is not set
 # CONFIG_SND_YMFPCI is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
 
 #
 # USB devices
 #
 # CONFIG_SND_USB_AUDIO is not set
 # CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_USB_CAIAQ is not set
 
 #
-# SoC audio support
+# System on Chip audio support
 #
 # CONFIG_SND_SOC is not set
 
 #
+# SoC Audio support for SuperH
+#
+
+#
 # Open Sound System
 #
 # CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=y
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
 
 #
-# USB support
+# USB Input Devices
 #
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1212,9 +1368,10 @@ CONFIG_USB=y
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_PERSIST is not set
 # CONFIG_USB_OTG is not set
 
 #
@@ -1223,10 +1380,15 @@ CONFIG_USB_DEVICEFS=y
 CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_UHCI_HCD=y
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 
 #
 # USB Device Class drivers
@@ -1252,43 +1414,14 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_SDDR55 is not set
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
 # CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_KARMA is not set
 # CONFIG_USB_LIBUSUAL is not set
 
 #
-# USB Input Devices
-#
-CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-# CONFIG_HID_FF is not set
-# CONFIG_USB_HIDDEV is not set
-# CONFIG_USB_AIPTEK is not set
-CONFIG_USB_WACOM=y
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET is not set
 CONFIG_USB_MON=y
 
 #
@@ -1306,17 +1439,23 @@ CONFIG_USB_MON=y
 #
 # CONFIG_USB_EMI62 is not set
 # CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
 # CONFIG_USB_AUERSWALD is not set
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
 # CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
 CONFIG_USB_CYTHERM=m
-# CONFIG_USB_PHIDGETKIT is not set
-CONFIG_USB_PHIDGETSERVO=m
+# CONFIG_USB_PHIDGET is not set
 # CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
 
 #
@@ -1327,39 +1466,29 @@ CONFIG_USB_PHIDGETSERVO=m
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
 # CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
+# CONFIG_RTC_CLASS is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
+CONFIG_VIRTUALIZATION=y
+# CONFIG_KVM is not set
+# CONFIG_LGUEST is not set
 
 #
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+# Userspace I/O
 #
-# CONFIG_EDAC is not set
+# CONFIG_UIO is not set
 
 #
-# Real Time Clock
+# Firmware Drivers
 #
-# CONFIG_RTC_CLASS is not set
+# CONFIG_EDD is not set
+# CONFIG_DELL_RBU is not set
+# CONFIG_DCDBAS is not set
+CONFIG_DMIID=y
 
 #
 # File systems
@@ -1371,17 +1500,19 @@ CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_XATTR=y
 # CONFIG_EXT3_FS_POSIX_ACL is not set
 # CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
 CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
@@ -1412,11 +1543,12 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 #
 CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
 
 #
@@ -1436,10 +1568,7 @@ CONFIG_RAMFS=y
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
+CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 # CONFIG_NFS_V3 is not set
 # CONFIG_NFS_V4 is not set
@@ -1452,6 +1581,7 @@ CONFIG_LOCKD=y
 CONFIG_EXPORTFS=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1459,17 +1589,12 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
 #
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_NLS_CODEPAGE_437=y
@@ -1510,27 +1635,28 @@ CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NLS_KOI8_U is not set
 # CONFIG_NLS_UTF8 is not set
-
-#
-# Instrumentation Support
-#
+# CONFIG_DLM is not set
+CONFIG_INSTRUMENTATION=y
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=y
 # CONFIG_KPROBES is not set
+# CONFIG_MARKERS is not set
 
 #
 # Kernel hacking
 #
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=15
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_TIMER_STATS=y
+CONFIG_UNUSED_SYMBOLS=y
 # CONFIG_DEBUG_FS is not set
-# CONFIG_UNWIND_INFO is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_SAMPLES is not set
 CONFIG_EARLY_PRINTK=y
-CONFIG_STACK_BACKTRACE_COLS=2
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_MPPARSE=y
 CONFIG_DOUBLEFAULT=y
@@ -1540,29 +1666,68 @@ CONFIG_DOUBLEFAULT=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-# CONFIG_CRYPTO is not set
-
-#
-# Hardware crypto devices
-#
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_MANAGER=m
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_XTS is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_TWOFISH_586 is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_AES_586 is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_GEODE=m
 
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=m
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_X86_SMP=y
-CONFIG_X86_HT=y
-CONFIG_X86_BIOS_REBOOT=y
-CONFIG_X86_TRAMPOLINE=y
-CONFIG_KTIME_SCALAR=y
-# CONFIG_SHARPSL_RC is not set
+CONFIG_AUDIT_GENERIC=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-spitz b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-spitz
index 6116d5b21..97b9bf6c9 100644
--- a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-spitz
+++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-spitz
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.23-rc4
-# Tue Aug 28 22:32:38 2007
+# Linux kernel version: 2.6.24-rc8
+# Sun Jan 20 18:32:23 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -43,9 +43,14 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_FAIR_USER_SCHED=y
+# CONFIG_FAIR_CGROUP_SCHED is not set
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 # CONFIG_BLK_DEV_INITRD is not set
@@ -66,13 +71,13 @@ CONFIG_FUTEX=y
 CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
+CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
@@ -139,7 +144,7 @@ CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_OMAP is not set
 
 #
-# Intel PXA2xx Implementations
+# Intel PXA2xx/PXA3xx Implementations
 #
 # CONFIG_ARCH_LUBBOCK is not set
 # CONFIG_MACH_LOGICPD_PXA270 is not set
@@ -148,9 +153,11 @@ CONFIG_ARCH_PXA=y
 CONFIG_PXA_SHARPSL=y
 # CONFIG_MACH_TRIZEPS4 is not set
 # CONFIG_MACH_EM_X270 is not set
-# CONFIG_MACH_HX2750 is not set
+# CONFIG_MACH_ZYLONITE is not set
+# CONFIG_MACH_ARMCORE is not set
 # CONFIG_PXA_SHARPSL_25x is not set
 CONFIG_PXA_SHARPSL_27x=y
+# CONFIG_MACH_HX2750 is not set
 CONFIG_MACH_AKITA=y
 CONFIG_MACH_SPITZ=y
 CONFIG_MACH_BORZOI=y
@@ -196,10 +203,6 @@ CONFIG_SHARP_SCOOP=y
 #
 # CONFIG_PCI_SYSCALL is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
 CONFIG_PCCARD=y
 # CONFIG_PCMCIA_DEBUG is not set
 CONFIG_PCMCIA=y
@@ -217,6 +220,7 @@ CONFIG_PCMCIA_PXA2XX=y
 # CONFIG_TICK_ONESHOT is not set
 # CONFIG_NO_HZ is not set
 # CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_PREEMPT=y
 CONFIG_HZ=100
 CONFIG_AEABI=y
@@ -229,6 +233,7 @@ CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
@@ -244,6 +249,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/hda1 rootfstype=ext3 rootdelay=1 rw  fbcon=rotate:1 dyntick=enable debug"
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
 
 #
 # CPU Frequency scaling
@@ -275,6 +281,7 @@ CONFIG_PM=y
 # CONFIG_PM_LEGACY is not set
 # CONFIG_PM_DEBUG is not set
 CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND_UP_POSSIBLE=y
 CONFIG_SUSPEND=y
 CONFIG_APM_EMULATION=y
 
@@ -286,7 +293,7 @@ CONFIG_NET=y
 #
 # Networking options
 #
-CONFIG_PACKET=y
+CONFIG_PACKET=m
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
@@ -311,6 +318,7 @@ CONFIG_INET_TUNNEL=m
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
 CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
@@ -345,14 +353,60 @@ CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_NETLINK is not set
 # CONFIG_NF_CONNTRACK_ENABLED is not set
 # CONFIG_NF_CONNTRACK is not set
-# CONFIG_NETFILTER_XTABLES is not set
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
 
 #
 # IP: Netfilter Configuration
 #
 CONFIG_IP_NF_QUEUE=m
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_ARPTABLES is not set
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
 
 #
 # IPv6: Netfilter Configuration (EXPERIMENTAL)
@@ -373,10 +427,6 @@ CONFIG_IP_NF_QUEUE=m
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
 # CONFIG_NET_SCHED is not set
 
 #
@@ -414,6 +464,8 @@ CONFIG_IRCOMM=m
 # Dongle support
 #
 # CONFIG_KINGSUN_DONGLE is not set
+# CONFIG_KSDAZZLE_DONGLE is not set
+# CONFIG_KS959_DONGLE is not set
 
 #
 # Old SIR device drivers
@@ -446,9 +498,11 @@ CONFIG_BT_HIDP=m
 #
 CONFIG_BT_HCIUSB=m
 # CONFIG_BT_HCIUSB_SCO is not set
+# CONFIG_BT_HCIBTSDIO is not set
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIUART_LL is not set
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@@ -481,6 +535,7 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
 #
 # Generic Driver Options
 #
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
@@ -493,7 +548,6 @@ CONFIG_MTD=m
 # CONFIG_MTD_CONCAT is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
-CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
 
 #
@@ -502,11 +556,13 @@ CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_CHAR=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
+# CONFIG_MTD_BLOCK_RO is not set
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
 # CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -524,7 +580,7 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_CFI_I4 is not set
 # CONFIG_MTD_CFI_I8 is not set
 # CONFIG_MTD_RAM is not set
-CONFIG_MTD_ROM=y
+CONFIG_MTD_ROM=m
 # CONFIG_MTD_ABSENT is not set
 
 #
@@ -549,16 +605,17 @@ CONFIG_MTD_SHARP_SL=y
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND=m
 CONFIG_MTD_NAND_VERIFY_WRITE=y
 # CONFIG_MTD_NAND_ECC_SMC is not set
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_H1900 is not set
-CONFIG_MTD_NAND_IDS=y
+CONFIG_MTD_NAND_IDS=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
-CONFIG_MTD_NAND_SHARPSL=y
+CONFIG_MTD_NAND_SHARPSL=m
 # CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_ALAUDA is not set
 # CONFIG_MTD_ONENAND is not set
 
 #
@@ -575,6 +632,8 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
@@ -597,9 +656,10 @@ CONFIG_IDE_PROC_FS=y
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_GENERIC=y
-# CONFIG_IDEPCI_PCIBUS_ORDER is not set
+# CONFIG_BLK_DEV_PLATFORM is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -639,6 +699,7 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_SCSI_DEBUG is not set
@@ -655,7 +716,9 @@ CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
 # CONFIG_DM_MULTIPATH_RDAC is not set
+# CONFIG_DM_MULTIPATH_HP is not set
 # CONFIG_DM_DELAY is not set
+# CONFIG_DM_UEVENT is not set
 CONFIG_NETDEVICES=y
 # CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
@@ -663,6 +726,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
+# CONFIG_VETH is not set
 # CONFIG_PHYLIB is not set
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=m
@@ -670,6 +734,11 @@ CONFIG_MII=m
 # CONFIG_SMC91X is not set
 # CONFIG_DM9000 is not set
 # CONFIG_SMC911X is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_B44 is not set
 CONFIG_NETDEV_1000=y
 CONFIG_NETDEV_10000=y
 
@@ -684,9 +753,9 @@ CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 # CONFIG_LIBERTAS is not set
 CONFIG_HERMES=m
-# CONFIG_ATMEL is not set
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
+# CONFIG_ATMEL is not set
 CONFIG_AIRO_CS=m
 # CONFIG_PCMCIA_WL3501 is not set
 # CONFIG_USB_ZD1201 is not set
@@ -702,7 +771,6 @@ CONFIG_USB_CATC=m
 CONFIG_USB_KAWETH=m
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET_MII=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_CDCETHER=m
@@ -757,7 +825,6 @@ CONFIG_INPUT_MOUSEDEV=m
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
 # CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
 CONFIG_INPUT_POWER=y
@@ -833,7 +900,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_IPMI_HANDLER is not set
-# CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=m
 # CONFIG_NVRAM is not set
 # CONFIG_R3964 is not set
@@ -893,35 +959,20 @@ CONFIG_I2C_PXA=y
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
 # CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
-CONFIG_MISC_DEVICES=y
-# CONFIG_EEPROM_93CX6 is not set
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MFD_SM501 is not set
-
-#
-# Multi-Function Devices
-#
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
+# CONFIG_WATCHDOG is not set
 
 #
-# LED drivers
+# Sonics Silicon Backplane
 #
-CONFIG_LEDS_SPITZ=y
-# CONFIG_LEDS_TOSA is not set
-# CONFIG_LEDS_GPIO is not set
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
 
 #
-# LED Triggers
+# Multifunction device drivers
 #
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
-# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+# CONFIG_MFD_SM501 is not set
 
 #
 # Multimedia devices
@@ -933,12 +984,12 @@ CONFIG_VIDEO_V4L2=y
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+# CONFIG_VIDEO_VIVI is not set
 # CONFIG_VIDEO_CPIA is not set
 # CONFIG_VIDEO_CPIA2 is not set
 # CONFIG_VIDEO_SAA5246A is not set
 # CONFIG_VIDEO_SAA5249 is not set
 # CONFIG_TUNER_3036 is not set
-# CONFIG_TUNER_TEA5761 is not set
 CONFIG_V4L_USB_DRIVERS=y
 # CONFIG_VIDEO_PVRUSB2 is not set
 # CONFIG_VIDEO_EM28XX is not set
@@ -966,15 +1017,6 @@ CONFIG_USB_DABUSB=m
 #
 # Graphics support
 #
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_CORGI=y
-
-#
-# Display device support
-#
-# CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
 CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_FB=y
@@ -983,6 +1025,7 @@ CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
 # CONFIG_FB_SYS_FILLRECT is not set
 # CONFIG_FB_SYS_COPYAREA is not set
 # CONFIG_FB_SYS_IMAGEBLIT is not set
@@ -1006,6 +1049,15 @@ CONFIG_FB_PXA_OVERLAY=y
 # CONFIG_FB_MBX is not set
 # CONFIG_FB_W100 is not set
 # CONFIG_FB_VIRTUAL is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_CORGI=y
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
 
 #
 # Console display driver support
@@ -1031,9 +1083,6 @@ CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
 # CONFIG_LOGO_LINUX_CLUT224 is not set
 CONFIG_LOGO_OHAND_CLUT224=y
-# CONFIG_LOGO_OZ240_CLUT224 is not set
-# CONFIG_LOGO_OZ480_CLUT224 is not set
-# CONFIG_LOGO_OZ640_CLUT224 is not set
 
 #
 # Sound
@@ -1110,8 +1159,9 @@ CONFIG_SND_SOC_WM8750=m
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
 CONFIG_HID_SUPPORT=y
-CONFIG_HID=y
+CONFIG_HID=m
 # CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
 
 #
 # USB Input Devices
@@ -1202,6 +1252,7 @@ CONFIG_USB_SERIAL_GENERIC=y
 # CONFIG_USB_SERIAL_AIRPRIME is not set
 # CONFIG_USB_SERIAL_ARK3116 is not set
 CONFIG_USB_SERIAL_BELKIN=m
+# CONFIG_USB_SERIAL_CH341 is not set
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
 # CONFIG_USB_SERIAL_CP2101 is not set
@@ -1285,6 +1336,7 @@ CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 CONFIG_USB_GADGET_SELECTED=y
 # CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_ATMEL_USBA is not set
 # CONFIG_USB_GADGET_FSL_USB2 is not set
 # CONFIG_USB_GADGET_NET2280 is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
@@ -1315,11 +1367,29 @@ CONFIG_MMC_UNSAFE_RESUME=y
 #
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_SDIO_UART is not set
 
 #
 # MMC/SD Host Controller Drivers
 #
 CONFIG_MMC_PXA=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_SPITZ=y
+# CONFIG_LEDS_TOSA is not set
+# CONFIG_LEDS_GPIO is not set
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_IDE_DISK=y
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -1339,6 +1409,7 @@ CONFIG_RTC_INTF_DEV=y
 # I2C RTC drivers
 #
 # CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
@@ -1369,19 +1440,6 @@ CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_DRV_SA1100=y
 
 #
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
-#
-
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1391,7 +1449,6 @@ CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
 # CONFIG_EXT4DEV_FS is not set
 CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
@@ -1433,7 +1490,6 @@ CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
 
 #
@@ -1449,6 +1505,7 @@ CONFIG_RAMFS=y
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
 CONFIG_JFFS2_SUMMARY=y
 # CONFIG_JFFS2_FS_XATTR is not set
 # CONFIG_JFFS2_SYSFS is not set
@@ -1465,16 +1522,12 @@ CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_SQUASHFS_VMALLOC is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
+CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
@@ -1528,10 +1581,6 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_SYSV68_PARTITION is not set
-
-#
-# Native Language Support
-#
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="cp437"
 CONFIG_NLS_CODEPAGE_437=y
@@ -1572,22 +1621,17 @@ CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
 CONFIG_NLS_KOI8_U=m
 CONFIG_NLS_UTF8=y
-
-#
-# Distributed Lock Manager
-#
 # CONFIG_DLM is not set
-
-#
-# Profiling support
-#
+CONFIG_INSTRUMENTATION=y
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
+# CONFIG_MARKERS is not set
 
 #
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
@@ -1615,10 +1659,13 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_FORCED_INLINING is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_FAULT_INJECTION is not set
+# CONFIG_SAMPLES is not set
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEBUG_ERRORS=y
 # CONFIG_DEBUG_LL is not set
@@ -1628,6 +1675,7 @@ CONFIG_DEBUG_ERRORS=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=m
@@ -1648,6 +1696,7 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_XTS is not set
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_FCRYPT is not set
@@ -1662,12 +1711,14 @@ CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_ANUBIS=m
+# CONFIG_CRYPTO_SEED is not set
 CONFIG_CRYPTO_DEFLATE=m
 # CONFIG_CRYPTO_LZO is not set
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
 # CONFIG_CRYPTO_CAMELLIA is not set
 CONFIG_CRYPTO_TEST=m
+# CONFIG_CRYPTO_AUTHENC is not set
 # CONFIG_CRYPTO_HW is not set
 
 #
diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-tosa b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-tosa
index 668c1788a..5173e242a 100644
--- a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-tosa
+++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-tosa
@@ -143,6 +143,7 @@ CONFIG_CPU_TLB_V4WBI=y
 CONFIG_ARM_THUMB=y
 CONFIG_XSCALE_PMU=y
 CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
 CONFIG_SHARP_PARAM=y
 CONFIG_SHARPSL_PM=y
 CONFIG_SHARP_SCOOP=y
@@ -248,7 +249,7 @@ CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=m
-# CONFIG_NET_KEY is not set
+CONFIG_NET_KEY=m
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
@@ -262,6 +263,9 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
@@ -285,23 +289,64 @@ CONFIG_NETFILTER=y
 # Core Netfilter Configuration
 #
 # CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NETFILTER_XTABLES is not set
+# CONFIG_NF_CONNTRACK_ENABLED is not set
+# CONFIG_NF_CONNTRACK is not set
+
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
 
 #
 # IP: Netfilter Configuration
 #
-CONFIG_IP_NF_CONNTRACK=m
-# CONFIG_IP_NF_CT_ACCT is not set
-# CONFIG_IP_NF_CONNTRACK_MARK is not set
-# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-CONFIG_IP_NF_CT_PROTO_SCTP=m
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_IRC=m
-# CONFIG_IP_NF_NETBIOS_NS is not set
-CONFIG_IP_NF_TFTP=m
-CONFIG_IP_NF_AMANDA=m
-# CONFIG_IP_NF_PPTP is not set
 CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
 
 #
 # IPv6: Netfilter Configuration (EXPERIMENTAL)
@@ -431,7 +476,7 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
 #
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER=m
 # CONFIG_DEBUG_DRIVER is not set
 
 #
@@ -792,9 +837,11 @@ CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_WM97XX=y
 # CONFIG_TOUCHSCREEN_WM9705 is not set
 CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_TOSA=y
 # CONFIG_TOUCHSCREEN_WM9713 is not set
 # CONFIG_TOUCHSCREEN_WM97XX_PXA is not set
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=m
 
 #
 # Hardware I/O ports
@@ -1004,10 +1051,10 @@ CONFIG_FONT_8x8=y
 #
 # Logo configuration
 #
-CONFIG_LOGO=y
+# CONFIG_LOGO is not set
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO_LINUX_CLUT224 is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_DEVICE=y
@@ -1033,14 +1080,14 @@ CONFIG_SND_OSSEMUL=y
 CONFIG_SND_MIXER_OSS=m
 CONFIG_SND_PCM_OSS=m
 # CONFIG_SND_DYNAMIC_MINORS is not set
-CONFIG_SND_SUPPORT_OLD_API=y
+# CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
 
 #
 # Generic devices
 #
-CONFIG_SND_AC97_BUS=y
+CONFIG_AC97_BUS=y
 CONFIG_SND_DUMMY=m
 # CONFIG_SND_MTPAV is not set
 # CONFIG_SND_SERIAL_U16550 is not set
@@ -1072,15 +1119,15 @@ CONFIG_SND_SOC=y
 #
 # SoC Audio for the Intel PXA2xx
 #
-CONFIG_SND_PXA2xx_SOC=y
-CONFIG_SND_PXA2xx_SOC_AC97=y
-# CONFIG_SND_PXA2xx_SOC_MAINSTONE is not set
-# CONFIG_SND_PXA2xx_SOC_MAINSTONE_WM8753 is not set
-# CONFIG_SND_PXA2xx_SOC_MAINSTONE_WM9713 is not set
-# CONFIG_SND_PXA2xx_SOC_MAINSTONE_WM9712 is not set
-# CONFIG_SND_PXA2xx_SOC_CORGI is not set
-# CONFIG_SND_PXA2xx_SOC_SPITZ is not set
-CONFIG_SND_PXA2xx_SOC_TOSA=y
+CONFIG_SND_PXA2XX_SOC=y
+CONFIG_SND_PXA2XX_SOC_AC97=y
+# CONFIG_SND_PXA2XX_SOC_MAINSTONE is not set
+# CONFIG_SND_PXA2XX_SOC_MAINSTONE_WM8753 is not set
+# CONFIG_SND_PXA2XX_SOC_MAINSTONE_WM9713 is not set
+# CONFIG_SND_PXA2XX_SOC_MAINSTONE_WM9712 is not set
+# CONFIG_SND_PXA2XX_SOC_CORGI is not set
+# CONFIG_SND_PXA2XX_SOC_SPITZ is not set
+CONFIG_SND_PXA2XX_SOC_TOSA=y
 
 #
 # Soc Codecs
@@ -1100,6 +1147,9 @@ CONFIG_SND_SOC_WM9712=y
 # Open Sound System
 #
 # CONFIG_SOUND_PRIME is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+
 
 #
 # USB support
@@ -1301,12 +1351,11 @@ CONFIG_USB_IDMOUSE=m
 #
 # USB Gadget Support
 #
-CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 CONFIG_USB_GADGET_SELECTED=y
 # CONFIG_USB_GADGET_NET2280 is not set
 CONFIG_USB_GADGET_PXA2XX=y
-CONFIG_USB_PXA2XX=y
 # CONFIG_USB_PXA2XX_SMALL is not set
 # CONFIG_USB_GADGET_PXA27X is not set
 # CONFIG_USB_GADGET_GOKU is not set
@@ -1361,7 +1410,7 @@ CONFIG_RTC_DRV_SA1100=y
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
+CONFIG_EXT3_FS=m
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
@@ -1379,7 +1428,7 @@ CONFIG_FUSE_FS=m
 #
 # CD-ROM/DVD Filesystems
 #
-# CONFIG_ISO9660_FS is not set
+CONFIG_ISO9660_FS=m
 # CONFIG_UDF_FS is not set
 
 #
@@ -1399,7 +1448,7 @@ CONFIG_PROC_FS=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
+# CONFIG_RAMFS is not set
 # CONFIG_RELAYFS_FS is not set
 # CONFIG_CONFIGFS_FS is not set
 
@@ -1488,9 +1537,9 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Native Language Support
 #
-CONFIG_NLS=y
+CONFIG_NLS=m
 CONFIG_NLS_DEFAULT="cp437"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 CONFIG_NLS_CODEPAGE_737=m
 CONFIG_NLS_CODEPAGE_775=m
 CONFIG_NLS_CODEPAGE_850=m
@@ -1514,7 +1563,7 @@ CONFIG_NLS_ISO8859_8=m
 CONFIG_NLS_CODEPAGE_1250=m
 CONFIG_NLS_CODEPAGE_1251=m
 CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 CONFIG_NLS_ISO8859_2=m
 CONFIG_NLS_ISO8859_3=m
 CONFIG_NLS_ISO8859_4=m
@@ -1527,7 +1576,7 @@ CONFIG_NLS_ISO8859_14=m
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
 CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=y
+CONFIG_NLS_UTF8=m
 
 #
 # Profiling support
@@ -1543,6 +1592,7 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_TIMER_STATS=y
+# CONFIG_SCHED_DEBUG is not set
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_PREEMPT is not set
@@ -1572,7 +1622,8 @@ CONFIG_DEBUG_ERRORS=y
 # Cryptographic options
 #
 CONFIG_CRYPTO=y
-CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_HMAC=m
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-zylonite b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-zylonite
index 08e228c84..9e47d36b7 100644
--- a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-zylonite
+++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-zylonite
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.23-rc4
-# Tue Sep 25 15:57:10 2007
+# Linux kernel version: 2.6.24-rc8
+# Sun Jan 20 18:42:35 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -41,9 +41,14 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_FAIR_USER_SCHED=y
+# CONFIG_FAIR_CGROUP_SCHED is not set
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -65,13 +70,13 @@ CONFIG_FUTEX=y
 CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
+CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
@@ -155,8 +160,7 @@ CONFIG_CPU_PXA320=y
 # CONFIG_MACH_TRIZEPS4 is not set
 # CONFIG_MACH_EM_X270 is not set
 CONFIG_MACH_ZYLONITE=y
-# CONFIG_MACH_HX2750 is not set
-# CONFIG_MACH_HTCUNIVERSAL is not set
+# CONFIG_MACH_ARMCORE is not set
 CONFIG_PXA3xx=y
 
 #
@@ -194,10 +198,6 @@ CONFIG_IWMMXT=y
 #
 # CONFIG_PCI_SYSCALL is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
 # CONFIG_PCCARD is not set
 
 #
@@ -206,6 +206,7 @@ CONFIG_IWMMXT=y
 # CONFIG_TICK_ONESHOT is not set
 # CONFIG_NO_HZ is not set
 # CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 # CONFIG_PREEMPT is not set
 CONFIG_HZ=100
 CONFIG_AEABI=y
@@ -218,6 +219,7 @@ CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
@@ -232,7 +234,8 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="console=ttyS0,38400 root=/dev/mtdblock2 rootfstype=jffs2 mem=64M  dyntick=enable debug"
 # CONFIG_XIP_KERNEL is not set
-# CONFIG_KEXEC is not set
+CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
 
 #
 # CPU Frequency scaling
@@ -261,6 +264,7 @@ CONFIG_BINFMT_ELF=y
 # Power management options
 #
 # CONFIG_PM is not set
+CONFIG_SUSPEND_UP_POSSIBLE=y
 
 #
 # Networking
@@ -271,6 +275,7 @@ CONFIG_NET=y
 # Networking options
 #
 CONFIG_PACKET=m
+# CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
@@ -297,17 +302,81 @@ CONFIG_IP_PNP=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
 CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
+# CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETFILTER is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NF_CONNTRACK_ENABLED is not set
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_TIPC is not set
@@ -322,10 +391,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
 # CONFIG_NET_SCHED is not set
 
 #
@@ -362,6 +427,8 @@ CONFIG_IRDA=y
 # Dongle support
 #
 # CONFIG_KINGSUN_DONGLE is not set
+# CONFIG_KSDAZZLE_DONGLE is not set
+# CONFIG_KS959_DONGLE is not set
 
 #
 # Old SIR device drivers
@@ -399,6 +466,7 @@ CONFIG_IRDA=y
 #
 # Generic Driver Options
 #
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_FW_LOADER=y
@@ -425,6 +493,7 @@ CONFIG_MTD_BLOCK=y
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
 # CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -490,6 +559,7 @@ CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND_SHARPSL is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_ALAUDA is not set
 # CONFIG_MTD_ONENAND is not set
 
 #
@@ -509,6 +579,8 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
 
@@ -529,9 +601,10 @@ CONFIG_IDE_PROC_FS=y
 # IDE chipset support/bugfixes
 #
 # CONFIG_IDE_GENERIC is not set
-# CONFIG_IDEPCI_PCIBUS_ORDER is not set
+# CONFIG_BLK_DEV_PLATFORM is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -570,6 +643,7 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_SCSI_DEBUG is not set
@@ -582,6 +656,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
+# CONFIG_VETH is not set
 # CONFIG_PHYLIB is not set
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
@@ -589,6 +664,11 @@ CONFIG_MII=y
 CONFIG_SMC91X=y
 # CONFIG_DM9000 is not set
 # CONFIG_SMC911X is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_B44 is not set
 CONFIG_NETDEV_1000=y
 CONFIG_NETDEV_10000=y
 
@@ -605,7 +685,6 @@ CONFIG_NETDEV_10000=y
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET_MII is not set
 CONFIG_USB_USBNET=y
 # CONFIG_USB_NET_AX8817X is not set
 CONFIG_USB_NET_CDCETHER=y
@@ -647,12 +726,8 @@ CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_TSDEV=y
-CONFIG_INPUT_TSDEV_SCREEN_X=240
-CONFIG_INPUT_TSDEV_SCREEN_Y=320
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_POWER is not set
 
 #
 # Input Device Drivers
@@ -714,7 +789,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_IPMI_HANDLER is not set
-# CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_NVRAM is not set
 # CONFIG_R3964 is not set
@@ -784,20 +858,18 @@ CONFIG_W1=y
 # CONFIG_W1_SLAVE_DS2760 is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
-CONFIG_MISC_DEVICES=y
-# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_WATCHDOG is not set
 
 #
-# Multifunction device drivers
+# Sonics Silicon Backplane
 #
-# CONFIG_MFD_SM501 is not set
-# CONFIG_HTC_ASIC3 is not set
-# CONFIG_HTC_ASIC3_DS1WM is not set
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
 
 #
-# Multi-Function Devices
+# Multifunction device drivers
 #
-# CONFIG_NEW_LEDS is not set
+# CONFIG_MFD_SM501 is not set
 
 #
 # Multimedia devices
@@ -809,12 +881,12 @@ CONFIG_VIDEO_V4L2=y
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+# CONFIG_VIDEO_VIVI is not set
 # CONFIG_VIDEO_CPIA is not set
 # CONFIG_VIDEO_CPIA2 is not set
 # CONFIG_VIDEO_SAA5246A is not set
 # CONFIG_VIDEO_SAA5249 is not set
 # CONFIG_TUNER_3036 is not set
-# CONFIG_TUNER_TEA5761 is not set
 CONFIG_V4L_USB_DRIVERS=y
 # CONFIG_VIDEO_PVRUSB2 is not set
 # CONFIG_VIDEO_EM28XX is not set
@@ -842,12 +914,6 @@ CONFIG_DAB=y
 #
 # Graphics support
 #
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-
-#
-# Display device support
-#
-# CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
 CONFIG_VIDEO_OUTPUT_CONTROL=y
 CONFIG_FB=y
@@ -856,6 +922,7 @@ CONFIG_FB=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
 # CONFIG_FB_SYS_FILLRECT is not set
 # CONFIG_FB_SYS_COPYAREA is not set
 # CONFIG_FB_SYS_IMAGEBLIT is not set
@@ -878,6 +945,12 @@ CONFIG_FB_PXA_OVERLAY=y
 # CONFIG_FB_PXA_PARAMETERS is not set
 # CONFIG_FB_MBX is not set
 # CONFIG_FB_VIRTUAL is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
 
 #
 # Console display driver support
@@ -901,11 +974,8 @@ CONFIG_FONT_8x16=y
 CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
-# CONFIG_LOGO_OHAND_CLUT224 is not set
-# CONFIG_LOGO_OZ240_CLUT224 is not set
-# CONFIG_LOGO_OZ480_CLUT224 is not set
-# CONFIG_LOGO_OZ640_CLUT224 is not set
+# CONFIG_LOGO_LINUX_CLUT224 is not set
+CONFIG_LOGO_OHAND_CLUT224=y
 
 #
 # Sound
@@ -964,6 +1034,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
 
 #
 # USB Input Devices
@@ -1070,8 +1141,10 @@ CONFIG_USB_MON=y
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_SELECTED=y
 # CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_ATMEL_USBA is not set
 # CONFIG_USB_GADGET_FSL_USB2 is not set
 # CONFIG_USB_GADGET_NET2280 is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
@@ -1101,11 +1174,13 @@ CONFIG_MMC=y
 #
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_SDIO_UART is not set
 
 #
 # MMC/SD Host Controller Drivers
 #
 CONFIG_MMC_PXA=y
+# CONFIG_NEW_LEDS is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -1125,6 +1200,7 @@ CONFIG_RTC_INTF_DEV=y
 # I2C RTC drivers
 #
 # CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
@@ -1155,26 +1231,19 @@ CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_DRV_SA1100=y
 
 #
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
-#
-
-#
 # File systems
 #
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
 # CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=m
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
@@ -1216,7 +1285,6 @@ CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
 
 #
@@ -1232,6 +1300,7 @@ CONFIG_RAMFS=y
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
 # CONFIG_JFFS2_SUMMARY is not set
 # CONFIG_JFFS2_FS_XATTR is not set
 # CONFIG_JFFS2_SYSFS is not set
@@ -1251,10 +1320,7 @@ CONFIG_JFFS2_CMODE_PRIORITY=y
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
+CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
@@ -1297,10 +1363,6 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_SYSV68_PARTITION is not set
-
-#
-# Native Language Support
-#
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_NLS_CODEPAGE_437=y
@@ -1341,22 +1403,17 @@ CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NLS_KOI8_U is not set
 # CONFIG_NLS_UTF8 is not set
-
-#
-# Distributed Lock Manager
-#
 # CONFIG_DLM is not set
-
-#
-# Profiling support
-#
+CONFIG_INSTRUMENTATION=y
 CONFIG_PROFILING=y
 # CONFIG_OPROFILE is not set
+# CONFIG_MARKERS is not set
 
 #
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
@@ -1383,10 +1440,13 @@ CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_FORCED_INLINING=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_FAULT_INJECTION is not set
+# CONFIG_SAMPLES is not set
 CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
@@ -1397,6 +1457,7 @@ CONFIG_DEBUG_LL=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1416,6 +1477,7 @@ CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_PCBC=y
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_XTS is not set
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_FCRYPT is not set
@@ -1429,12 +1491,14 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_ARC4 is not set
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_DEFLATE is not set
 # CONFIG_CRYPTO_LZO is not set
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_AUTHENC is not set
 CONFIG_CRYPTO_HW=y
 
 #
diff --git a/meta/packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb b/meta/packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb
index efffb6e40..f7b20f895 100644
--- a/meta/packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb
+++ b/meta/packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r4"
+PR = "r5"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -137,7 +137,6 @@ SRC_URI_append_htcuniversal ="\
 	"
 
 SRC_URI_append_zylonite ="\
-	file://arm_pxa_20070923.patch;patch=1 \
 	file://pxa_fb_overlay.patch;patch=1 \
 	file://zylonite-boot.patch;patch=1 \
 	"