[kernel] update to kernel 2.6.36.4

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

diff --git a/target/linux/avr32/config-default b/target/linux/avr32/config-default
index ec6565f..edd646d 100644 (file)
--- a/target/linux/avr32/config-default
+++ b/target/linux/avr32/config-default
@@ -12,15 +12,16 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_AT32AP700X_WDT=m
 # CONFIG_ATMEL_PWM is not set
 # CONFIG_ATMEL_SSC is not set
 CONFIG_AT32AP700X_WDT=m
 # CONFIG_ATMEL_PWM is not set
 # CONFIG_ATMEL_SSC is not set

-CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0

 CONFIG_ATMEL_TCB_CLKSRC=y
 CONFIG_ATMEL_TCB_CLKSRC=y

+CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0

 CONFIG_ATMEL_TCLIB=y
 CONFIG_AVR32=y
 CONFIG_BITREVERSE=y
 CONFIG_BOARD_ATNGW100_ADDON_NONE=y
 # CONFIG_BOARD_ATNGW100_EVKLCD10X is not set
 CONFIG_ATMEL_TCLIB=y
 CONFIG_AVR32=y
 CONFIG_BITREVERSE=y
 CONFIG_BOARD_ATNGW100_ADDON_NONE=y
 # CONFIG_BOARD_ATNGW100_EVKLCD10X is not set

+CONFIG_BOARD_ATNGW100_MKI=y
+# CONFIG_BOARD_ATNGW100_MKII is not set

 # CONFIG_BOARD_ATNGW100_MRMT is not set
 # CONFIG_BOARD_ATNGW100_MRMT is not set

-CONFIG_BOARD_ATNGW100=y

 # CONFIG_BOARD_ATSTK1000 is not set
 # CONFIG_BOARD_FAVR_32 is not set
 # CONFIG_BOARD_HAMMERHEAD is not set
 # CONFIG_BOARD_ATSTK1000 is not set
 # CONFIG_BOARD_FAVR_32 is not set
 # CONFIG_BOARD_HAMMERHEAD is not set


@@ -36,8 +37,8 @@ CONFIG_ENTRY_ADDRESS=0x90000000
 # CONFIG_FSNOTIFY is not set
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_GENERIC_BUG=y
 # CONFIG_FSNOTIFY is not set
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_GENERIC_BUG=y

-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y

 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS=y

+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y

 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GPIOLIB=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GPIOLIB=y


@@ -51,25 +52,25 @@ CONFIG_HAVE_CLK=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_HW_RANDOM is not set

+CONFIG_I2C=m

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

-CONFIG_I2C=m

 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_LEDS_GPIO=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_LEDS_GPIO=y

-CONFIG_LOAD_ADDRESS=0x10000000

 CONFIG_LOADER_U_BOOT=y
 CONFIG_LOADER_U_BOOT=y

+CONFIG_LOAD_ADDRESS=0x10000000

 CONFIG_MACB=y
 CONFIG_MACB=y

+CONFIG_MMC=m

 # CONFIG_MMC_AT91 is not set
 # CONFIG_MMC_AT91 is not set

-# CONFIG_MMC_ATMELMCI_DMA is not set

 CONFIG_MMC_ATMELMCI=m
 CONFIG_MMC_ATMELMCI=m

+# CONFIG_MMC_ATMELMCI_DMA is not set

 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK=m

-CONFIG_MMC=m

 # CONFIG_MTD_CFI_INTELEXT is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_CFI_INTELEXT is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set

+CONFIG_MTD_DATAFLASH=y

 # CONFIG_MTD_DATAFLASH_OTP is not set
 # CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
 # CONFIG_MTD_DATAFLASH_OTP is not set
 # CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set

-CONFIG_MTD_DATAFLASH=y

 CONFIG_MTD_PHYSMAP=y
 # CONFIG_NEED_NODE_MEMMAP_SIZE is not set
 # CONFIG_NET_DMA is not set
 CONFIG_MTD_PHYSMAP=y
 # CONFIG_NEED_NODE_MEMMAP_SIZE is not set
 # CONFIG_NET_DMA is not set


@@ -78,6 +79,7 @@ CONFIG_NO_HZ=y
 CONFIG_NR_QUICK=2
 # CONFIG_OWNERSHIP_TRACE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_NR_QUICK=2
 # CONFIG_OWNERSHIP_TRACE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y

+# CONFIG_PATA_AT32 is not set

 CONFIG_PERFORMANCE_COUNTERS=y
 CONFIG_PHYLIB=y
 CONFIG_PHYS_OFFSET=0x10000000
 CONFIG_PERFORMANCE_COUNTERS=y
 CONFIG_PHYLIB=y
 CONFIG_PHYS_OFFSET=0x10000000


@@ -90,16 +92,19 @@ CONFIG_SCHED_HRTICK=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SDIO_UART is not set
 # CONFIG_SERIAL_8250 is not set
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SDIO_UART is not set
 # CONFIG_SERIAL_8250 is not set

+CONFIG_SERIAL_ATMEL=y

 CONFIG_SERIAL_ATMEL_CONSOLE=y
 CONFIG_SERIAL_ATMEL_PDC=y
 # CONFIG_SERIAL_ATMEL_TTYAT is not set
 CONFIG_SERIAL_ATMEL_CONSOLE=y
 CONFIG_SERIAL_ATMEL_PDC=y
 # CONFIG_SERIAL_ATMEL_TTYAT is not set

-CONFIG_SERIAL_ATMEL=y
+# CONFIG_SND_ATMEL_ABDAC is not set
+# CONFIG_SND_ATMEL_AC97C is not set
+# CONFIG_SND_ATMEL_SOC is not set
+CONFIG_SPI=y

 CONFIG_SPI_ATMEL=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_GPIO is not set
 CONFIG_SPI_MASTER=y
 # CONFIG_SPI_SPIDEV is not set
 CONFIG_SPI_ATMEL=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_GPIO is not set
 CONFIG_SPI_MASTER=y
 # CONFIG_SPI_SPIDEV is not set

-CONFIG_SPI=y

 CONFIG_SUBARCH_AVR32B=y
 # CONFIG_TREE_PREEMPT_RCU is not set
 CONFIG_TREE_RCU=y
 CONFIG_SUBARCH_AVR32B=y
 # CONFIG_TREE_PREEMPT_RCU is not set
 CONFIG_TREE_RCU=y