--- arch/arm/configs/blueangel_defconfig	2005-10-07 23:49:52.000000000 +0200
+++ .config	2005-10-09 16:27:35.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-hh2-xda0-ba0
-# Thu Oct  6 13:04:59 2005
+# Linux kernel version: 2.6.12-hh2
+# Sun Oct  9 16:27:35 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -107,24 +107,13 @@
 # CONFIG_MACH_H4700 is not set
 # CONFIG_MACH_HX2750 is not set
 # CONFIG_ARCH_H5400 is not set
-# CONFIG_MACH_HIMALAYA is not set
-CONFIG_HIMALAYA_INPUT=m
-CONFIG_HIMALAYA_TS=m
-# CONFIG_HIMALAYA_KP is not set
-CONFIG_TSC2200=m
+CONFIG_MACH_HIMALAYA=y
+# CONFIG_HIMALAYA_USB is not set
+# CONFIG_HIMALAYA_INPUT is not set
+# CONFIG_TSC2200 is not set
 # CONFIG_HIMALAYA_LEDS is not set
-# CONFIG_HIMALAYA_LCD is not set
 # CONFIG_HIMALAYA_BATTERY is not set
-CONFIG_MACH_BLUEANGEL=y
-CONFIG_MACH_BLUEANGEL_LCD=y
-CONFIG_MACH_BLUEANGEL_PCMCIA=m
-CONFIG_MACH_BLUEANGEL_SUSPEND=m
-CONFIG_MACH_BLUEANGEL_LEDS=m
-CONFIG_MACH_BLUEANGEL_KEYPAD=m
-CONFIG_MACH_BLUEANGEL_AUDIO=m
-CONFIG_MACH_BLUEANGEL_BATTERY=m
-CONFIG_MACH_BLUEANGEL_ROM=m
-CONFIG_MACH_BLUEANGEL_DPRAM=m
+# CONFIG_MACH_BLUEANGEL is not set
 # CONFIG_ARCH_AXIMX5 is not set
 # CONFIG_ARCH_AXIMX3 is not set
 # CONFIG_MACH_X30 is not set
@@ -158,6 +147,12 @@
 #
 # Compaq/iPAQ Platforms
 #
+CONFIG_PXA_IPAQ=y
+
+#
+# XScale-based iPAQ
+#
+CONFIG_IPAQ_HANDHELD=y
 
 #
 # Compaq/iPAQ Drivers
@@ -166,6 +161,9 @@
 #
 # Compaq/HP iPAQ Drivers
 #
+# CONFIG_IPAQ_SLEEVE is not set
+# CONFIG_IPAQ_SAMCOP is not set
+# CONFIG_IPAQ_HAMCOP is not set
 
 #
 # Bus support
@@ -175,15 +173,7 @@
 #
 # PCCARD (PCMCIA/CardBus) support
 #
-CONFIG_PCCARD=m
-CONFIG_PCMCIA_DEBUG=y
-CONFIG_PCMCIA=m
-
-#
-# PC-card bridges
-#
-# CONFIG_TCIC is not set
-CONFIG_PCMCIA_PXA2XX=m
+# CONFIG_PCCARD is not set
 
 #
 # Kernel Features
@@ -196,8 +186,8 @@
 #
 # Boot options
 #
-CONFIG_ZBOOT_ROM_TEXT=0
-CONFIG_ZBOOT_ROM_BSS=0
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE=""
 # CONFIG_XIP_KERNEL is not set
 
@@ -278,14 +268,12 @@
 CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_CFI_I4 is not set
 # CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=m
+# CONFIG_MTD_CFI_INTELEXT is not set
 # CONFIG_MTD_CFI_AMDSTD is not set
 # CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=m
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-CONFIG_MTD_XIP=y
 
 #
 # Mapping drivers for chip access
@@ -294,6 +282,7 @@
 # CONFIG_MTD_PHYSMAP is not set
 # CONFIG_MTD_MULTI_PHYSMAP is not set
 # CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_IPAQ is not set
 # CONFIG_MTD_EDB7312 is not set
 # CONFIG_MTD_SHARP_SL is not set
 # CONFIG_MTD_PLATRAM is not set
@@ -462,10 +451,6 @@
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIUART_BCSP_TXCRC is not set
-# CONFIG_BT_HCIDTL1 is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBTUART is not set
 # CONFIG_BT_HCIVHCI is not set
 CONFIG_NETDEVICES=y
 # CONFIG_DUMMY is not set
@@ -495,40 +480,10 @@
 #
 # Wireless LAN (non-hamradio)
 #
-CONFIG_NET_RADIO=y
-
-#
-# 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 is not set
-# CONFIG_ATMEL is not set
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
-# CONFIG_AIRO_CS is not set
-# CONFIG_PCMCIA_WL3501 is not set
-CONFIG_NET_WIRELESS=y
+# CONFIG_NET_RADIO is not set
 # CONFIG_HOSTAP is not set
 
 #
-# PCMCIA network device support
-#
-# CONFIG_NET_PCMCIA is not set
-
-#
 # Wan interfaces
 #
 # CONFIG_WAN is not set
@@ -565,7 +520,7 @@
 # Input Device Drivers
 #
 CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
@@ -582,7 +537,10 @@
 #
 # Hardware I/O ports
 #
-# CONFIG_SERIO is not set
+CONFIG_SERIO=y
+CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
 # CONFIG_GAMEPORT is not set
 
 #
@@ -709,11 +667,6 @@
 # Ftape, the floppy tape device driver
 #
 # CONFIG_DRM is not set
-
-#
-# PCMCIA character devices
-#
-# CONFIG_SYNCLINK_CS is not set
 # CONFIG_RAW_DRIVER is not set
 
 #
@@ -762,7 +715,7 @@
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_IMAGEON is not set
+CONFIG_FB_IMAGEON=y
 # CONFIG_FB_PXA is not set
 CONFIG_FB_W100=y
 # CONFIG_FB_S1D13XXX is not set
@@ -773,7 +726,7 @@
 #
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=m
 CONFIG_FONTS=y
 # CONFIG_FONT_8x8 is not set
 # CONFIG_FONT_8x16 is not set
@@ -805,7 +758,7 @@
 CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
+# CONFIG_SND_HWDEP is not set
 # CONFIG_SND_SEQUENCER is not set
 CONFIG_SND_OSSEMUL=y
 CONFIG_SND_MIXER_OSS=m
@@ -831,10 +784,6 @@
 # CONFIG_SND_PXA_AC97 is not set
 
 #
-# PCMCIA devices
-#
-
-#
 # Open Sound System
 #
 CONFIG_SOUND_PRIME=m
@@ -884,7 +833,7 @@
 # CONFIG_USB_GADGET_DUALSPEED is not set
 CONFIG_USB_ZERO=m
 CONFIG_USB_ETH=m
-# CONFIG_USB_ETH_RNDIS is not set
+CONFIG_USB_ETH_RNDIS=y
 CONFIG_USB_GADGETFS=m
 CONFIG_USB_FILE_STORAGE=m
 # CONFIG_USB_FILE_STORAGE_TEST is not set
@@ -894,14 +843,7 @@
 #
 # MMC/SD Card support
 #
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_BLOCK=m
-# CONFIG_MMC_PXA is not set
-# CONFIG_MMC_WBSD is not set
-# CONFIG_MMC_TMIO is not set
-# CONFIG_MMC_SAMCOP is not set
-CONFIG_MMC_ASIC3=m
+# CONFIG_MMC is not set
 
 #
 # LED devices
@@ -1016,7 +958,7 @@
 #
 CONFIG_NLS=m
 CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=m
+# CONFIG_NLS_CODEPAGE_437 is not set
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1040,7 +982,7 @@
 # CONFIG_NLS_CODEPAGE_1250 is not set
 # CONFIG_NLS_CODEPAGE_1251 is not set
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=m
+# CONFIG_NLS_ISO8859_1 is not set
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set