merge of '1c44ae3b4aae69a8d66c7c068c44f337bc51f559'

     and 'd039068c51d6eb51dd6d0bd1dd1306d490e3d527'

1 files changed, 15 insertions, 19 deletions

diff --git a/packages/linux/linux-rp-2.6.24/defconfig-poodle b/packages/linux/linux-rp-2.6.24/defconfig-poodle
index ecffc3aba6..841bcf285e 100644
--- a/packages/linux/linux-rp-2.6.24/defconfig-poodle
+++ b/packages/linux/linux-rp-2.6.24/defconfig-poodle
@@ -1,7 +1,7 @@
-#
+
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.24-rc8
-# Sun Jan 20 22:47:47 2008
+# Fri Jan 25 22:13:14 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -152,12 +152,12 @@ CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_PXA_IDP is not set
 CONFIG_PXA_SHARPSL=y
 # CONFIG_MACH_TRIZEPS4 is not set
+# CONFIG_MACH_HX2750 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_HTCUNIVERSAL is not set
 CONFIG_MACH_POODLE=y
 # CONFIG_MACH_CORGI is not set
@@ -206,16 +206,16 @@ CONFIG_SHARP_SCOOP=y
 #
 # CONFIG_PCI_SYSCALL is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_PCCARD=y
+CONFIG_PCCARD=m
 # CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=y
+CONFIG_PCMCIA=m
 CONFIG_PCMCIA_LOAD_CIS=y
 CONFIG_PCMCIA_IOCTL=y
 
 #
 # PC-card bridges
 #
-CONFIG_PCMCIA_PXA2XX=y
+CONFIG_PCMCIA_PXA2XX=m
 
 #
 # Kernel Features
@@ -652,17 +652,17 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_ATA_OVER_ETH is not set
 CONFIG_MISC_DEVICES=y
 # CONFIG_EEPROM_93CX6 is not set
-CONFIG_IDE=y
+CONFIG_IDE=m
 CONFIG_IDE_MAX_HWIFS=4
-CONFIG_BLK_DEV_IDE=y
+CONFIG_BLK_DEV_IDE=m
 
 #
 # Please see Documentation/ide.txt for help/info on IDE drives
 #
 # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_BLK_DEV_IDEDISK=m
 # CONFIG_IDEDISK_MULTI_MODE is not set
-CONFIG_BLK_DEV_IDECS=y
+CONFIG_BLK_DEV_IDECS=m
 # CONFIG_BLK_DEV_IDECD is not set
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
@@ -673,7 +673,7 @@ CONFIG_IDE_PROC_FS=y
 #
 # IDE chipset support/bugfixes
 #
-CONFIG_IDE_GENERIC=y
+CONFIG_IDE_GENERIC=m
 # CONFIG_BLK_DEV_PLATFORM is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
@@ -1063,7 +1063,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_PXA=y
 CONFIG_FB_PXA_LCD_QVGA=y
 # CONFIG_FB_PXA_LCD_VGA is not set
-CONFIG_FB_PXA_OVERLAY=y
+# 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
@@ -1098,11 +1098,7 @@ CONFIG_FONT_MINI_4x6=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
-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 is not set
 
 #
 # Sound
@@ -1133,7 +1129,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 #
 # Generic devices
 #
-# CONFIG_SND_AC97_CODEC is not set
+CONFIG_SND_AC97_CODEC=m
 # CONFIG_SND_DUMMY is not set
 # CONFIG_SND_VIRMIDI is not set
 # CONFIG_SND_MTPAV is not set
@@ -1175,7 +1171,7 @@ CONFIG_SND_SOC_WM8731=m
 # Open Sound System
 #
 # CONFIG_SOUND_PRIME is not set
-# CONFIG_AC97_BUS is not set
+CONFIG_AC97_BUS=m
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=m
 # CONFIG_HID_DEBUG is not set