upgrade avr32 to 2.6.30-rc7

SVN-Revision: 16291

1 files changed, 16 insertions, 13 deletions

diff --git a/target/linux/avr32/config-default b/target/linux/avr32/config-default
index 4b98b5dcc2..8dea3f004e 100644
--- a/target/linux/avr32/config-default
+++ b/target/linux/avr32/config-default
@@ -9,19 +9,22 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y
 # CONFIG_ARCH_SPARSEMEM_ENABLE is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
+# CONFIG_ASYNC_TX_DMA is not set
 CONFIG_AT32AP700X_WDT=m
 # CONFIG_ATMEL_PWM is not set
 # CONFIG_ATMEL_SSC is not set
-CONFIG_ATMEL_TCB_CLKSRC=y
 CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0
+CONFIG_ATMEL_TCB_CLKSRC=y
 CONFIG_ATMEL_TCLIB=y
 CONFIG_AVR32=y
 CONFIG_BASE_SMALL=0
 CONFIG_BITREVERSE=y
-CONFIG_BOARD_ATNGW100=y
 # CONFIG_BOARD_ATNGW100_EVKLCD10X 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_MERISC is not set
 # CONFIG_BOARD_MIMC200 is not set
 CONFIG_CLASSIC_RCU=y
 CONFIG_CPU_AT32AP7000=y
@@ -34,8 +37,8 @@ CONFIG_DW_DMAC=y
 CONFIG_ENTRY_ADDRESS=0x90000000
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GPIOLIB=y
 CONFIG_HARDIRQS_SW_RESEND=y
@@ -48,35 +51,35 @@ CONFIG_HAVE_CLK=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_HW_RANDOM is not set
-CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C=m
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_LEDS_GPIO=y
-CONFIG_LOADER_U_BOOT=y
 CONFIG_LOAD_ADDRESS=0x10000000
+CONFIG_LOADER_U_BOOT=y
 CONFIG_MACB=y
-CONFIG_MMC=m
-CONFIG_MMC_ATMELMCI=m
 # CONFIG_MMC_ATMELMCI_DMA is not set
-CONFIG_MMC_BLOCK=m
+CONFIG_MMC_ATMELMCI=m
 CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_MMC_BLOCK=m
 # CONFIG_MMC_DEBUG is not set
+CONFIG_MMC=m
 # CONFIG_MMC_SDHCI is not set
 # CONFIG_MMC_SPI is not set
 # CONFIG_MMC_UNSAFE_RESUME 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_PHYSMAP=y
+CONFIG_MTD_DATAFLASH=y
 CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 CONFIG_MTD_PHYSMAP_LEN=0x0
 CONFIG_MTD_PHYSMAP_START=0x80000000
+CONFIG_MTD_PHYSMAP=y
 # CONFIG_NEED_NODE_MEMMAP_SIZE is not set
-CONFIG_NF_CT_ACCT=y
 # CONFIG_NET_DMA is not set
+CONFIG_NF_CT_ACCT=y
 # CONFIG_NMI_DEBUGGING is not set
 CONFIG_NO_HZ=y
 CONFIG_NR_QUICK=2
@@ -93,16 +96,16 @@ CONFIG_SCHED_HRTICK=y
 # 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_SPI=y
+CONFIG_SERIAL_ATMEL=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=y
 CONFIG_SUBARCH_AVR32B=y
 CONFIG_TICK_ONESHOT=y
 # CONFIG_VGASTATE is not set