refresh generic 2.6.32 patches

[openwrt.git] / target / linux / pxa / config-default

diff --git a/target/linux/pxa/config-default b/target/linux/pxa/config-default
index 7ddc416..9b35134 100644 (file)
--- a/target/linux/pxa/config-default
+++ b/target/linux/pxa/config-default
@@ -4,18 +4,18 @@ CONFIG_APM_EMULATION=m
 CONFIG_ARCH_GUMSTIX=y
 # CONFIG_ARCH_LUBBOCK is not set
 CONFIG_ARCH_MTD_XIP=y
 CONFIG_ARCH_GUMSTIX=y
 # CONFIG_ARCH_LUBBOCK is not set
 CONFIG_ARCH_MTD_XIP=y

-CONFIG_ARCH_PXA=y

 # CONFIG_ARCH_PXA_ESERIES is not set
 # CONFIG_ARCH_PXA_IDP is not set
 # CONFIG_ARCH_PXA_PALM is not set
 # CONFIG_ARCH_PXA_ESERIES is not set
 # CONFIG_ARCH_PXA_IDP is not set
 # CONFIG_ARCH_PXA_PALM is not set

+CONFIG_ARCH_PXA=y

 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARCH_VIPER is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARCH_VIPER is not set

-CONFIG_ARM=y

 # CONFIG_ARM_THUMB is not set
 # CONFIG_ARM_THUMB is not set

+CONFIG_ARM=y

 # CONFIG_ARPD is not set
 CONFIG_ATA=m
 CONFIG_BITREVERSE=y
 # CONFIG_ARPD is not set
 CONFIG_ATA=m
 CONFIG_BITREVERSE=y


@@ -25,12 +25,12 @@ CONFIG_BLK_DEV_IDECS=m
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_CMDLINE="rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
 CONFIG_COMMON_CLKDEV=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_CMDLINE="rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
 CONFIG_COMMON_CLKDEV=y

-CONFIG_CPU_32=y

 CONFIG_CPU_32v5=y
 CONFIG_CPU_32v5=y

+CONFIG_CPU_32=y

 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y

-CONFIG_CPU_CP15=y

 CONFIG_CPU_CP15_MMU=y
 CONFIG_CPU_CP15_MMU=y

+CONFIG_CPU_CP15=y

 CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_XSCALE=y
 CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_XSCALE=y


@@ -42,8 +42,8 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_FPE_FASTFPE is not set
 # CONFIG_FPE_NWFPE is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_FPE_FASTFPE is not set
 # CONFIG_FPE_NWFPE is not set
 CONFIG_FRAME_POINTER=y

-CONFIG_GENERIC_CLOCKEVENTS=y

 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y

+CONFIG_GENERIC_CLOCKEVENTS=y

 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y


@@ -67,26 +67,24 @@ CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_HW_RANDOM is not set

-CONFIG_I2C=m

 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=m
 # CONFIG_I2C_DESIGNWARE is not set
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=m
 # CONFIG_I2C_DESIGNWARE is not set

+CONFIG_I2C=m

 CONFIG_I2C_PXA=m
 CONFIG_I2C_PXA_SLAVE=y
 CONFIG_IDE=m
 CONFIG_I2C_PXA=m
 CONFIG_I2C_PXA_SLAVE=y
 CONFIG_IDE=m

-CONFIG_INOTIFY=y

 CONFIG_INOTIFY_USER=y
 CONFIG_INOTIFY_USER=y

-# CONFIG_ISDN is not set
+CONFIG_INOTIFY=y

 CONFIG_IWMMXT=y
 CONFIG_IWMMXT=y

-# CONFIG_KERNEL_BZIP2 is not set

 # CONFIG_LEDS_GPIO is not set
 CONFIG_MAC80211_DEFAULT_PS_VALUE=0
 # CONFIG_MACH_ARMCORE is not set
 # CONFIG_MACH_BALLOON3 is not set
 # CONFIG_MACH_CM_X300 is not set
 # CONFIG_LEDS_GPIO is not set
 CONFIG_MAC80211_DEFAULT_PS_VALUE=0
 # CONFIG_MACH_ARMCORE is not set
 # CONFIG_MACH_BALLOON3 is not set
 # CONFIG_MACH_CM_X300 is not set

-# CONFIG_MACH_COLIBRI is not set

 # CONFIG_MACH_COLIBRI300 is not set
 # CONFIG_MACH_COLIBRI320 is not set
 # CONFIG_MACH_COLIBRI300 is not set
 # CONFIG_MACH_COLIBRI320 is not set

+# CONFIG_MACH_COLIBRI is not set

 # CONFIG_MACH_CSB726 is not set
 # CONFIG_MACH_EM_X270 is not set
 # CONFIG_MACH_EXEDA is not set
 # CONFIG_MACH_CSB726 is not set
 # CONFIG_MACH_EM_X270 is not set
 # CONFIG_MACH_EXEDA is not set


@@ -110,9 +108,9 @@ CONFIG_MACH_GUMSTIX_VERDEX=y
 # CONFIG_MACH_ZYLONITE is not set
 # CONFIG_MFD_T7L66XB is not set
 CONFIG_MII=m
 # CONFIG_MACH_ZYLONITE is not set
 # CONFIG_MFD_T7L66XB is not set
 CONFIG_MII=m

-CONFIG_MMC=y

 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_PXA=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_PXA=y

+CONFIG_MMC=y

 CONFIG_MTD_CFI_ADV_OPTIONS=y
 # CONFIG_MTD_CFI_AMDSTD is not set
 CONFIG_MTD_CFI_GEOMETRY=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 # CONFIG_MTD_CFI_AMDSTD is not set
 CONFIG_MTD_CFI_GEOMETRY=y


@@ -128,13 +126,13 @@ CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PATA_PCMCIA=m
 CONFIG_PCCARD=m
 # CONFIG_PCI_SYSCALL is not set
 CONFIG_PATA_PCMCIA=m
 CONFIG_PCCARD=m
 # CONFIG_PCI_SYSCALL is not set

-CONFIG_PCMCIA=m

 CONFIG_PCMCIA_LOAD_CIS=y
 CONFIG_PCMCIA_LOAD_CIS=y

+CONFIG_PCMCIA=m

 CONFIG_PCMCIA_PXA2XX=m
 CONFIG_PLAT_PXA=y
 CONFIG_PCMCIA_PXA2XX=m
 CONFIG_PLAT_PXA=y

-CONFIG_PM=y

 # CONFIG_PM_DEBUG is not set
 # CONFIG_PM_RUNTIME is not set
 # CONFIG_PM_DEBUG is not set
 # CONFIG_PM_RUNTIME is not set

+CONFIG_PM=y

 CONFIG_PXA27x=y
 # CONFIG_PXA_EZX is not set
 # CONFIG_PXA_SHARPSL is not set
 CONFIG_PXA27x=y
 # CONFIG_PXA_EZX is not set
 # CONFIG_PXA_SHARPSL is not set


@@ -144,15 +142,15 @@ CONFIG_SCSI=m
 # CONFIG_SCSI_PROC_FS is not set
 # CONFIG_SDIO_UART is not set
 # CONFIG_SERIAL_8250 is not set
 # CONFIG_SCSI_PROC_FS is not set
 # CONFIG_SDIO_UART is not set
 # CONFIG_SERIAL_8250 is not set

-CONFIG_SERIAL_PXA=y

 CONFIG_SERIAL_PXA_CONSOLE=y
 CONFIG_SERIAL_PXA_CONSOLE=y

-CONFIG_SERIO=m
+CONFIG_SERIAL_PXA=y

 CONFIG_SERIO_LIBPS2=m
 CONFIG_SERIO_LIBPS2=m

+CONFIG_SERIO=m

 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=m
 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=m

-CONFIG_SMSC911X=y

 CONFIG_SMC911X=m
 CONFIG_SMC91X=m
 CONFIG_SMC911X=m
 CONFIG_SMC91X=m

+CONFIG_SMSC911X=y

 CONFIG_SPLIT_PTLOCK_CPUS=4096
 # CONFIG_SUSPEND is not set
 # CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 # CONFIG_SUSPEND is not set
 # CONFIG_SYSCTL_SYSCALL is not set