+++ /dev/null
-CONFIG_AP700X_16_BIT_SMC=y
-# CONFIG_AP700X_32_BIT_SMC is not set
-# CONFIG_AP700X_8_BIT_SMC is not set
-# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-# CONFIG_ARCH_HAVE_MEMORY_PRESENT is not set
-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_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_TCLIB=y
-CONFIG_AVR32=y
-CONFIG_BOARD_ATNGW100_ADDON_NONE=y
-CONFIG_BOARD_ATNGW100_COMMON=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_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_CPU_AT32AP7000=y
-CONFIG_CPU_AT32AP700X=y
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DMADEVICES=y
-CONFIG_DMA_ENGINE=y
-CONFIG_DW_DMAC=y
-CONFIG_ENTRY_ADDRESS=0x90000000
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_GENERIC_ATOMIC64=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GPIOLIB=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-# CONFIG_HAVE_ARCH_BOOTMEM is not set
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_FB_ATMEL=y
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_HAVE_GENERIC_HARDIRQS=y
-CONFIG_HAVE_NET_MACB=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-# CONFIG_I2C_PXA_PCI is not set
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_LEDS_GPIO=y
-CONFIG_LOADER_U_BOOT=y
-CONFIG_LOAD_ADDRESS=0x10000000
-CONFIG_MACB=y
-CONFIG_MACH_NO_WESTBRIDGE=y
-CONFIG_MMC=m
-CONFIG_MMC_ATMELMCI=m
-# CONFIG_MMC_ATMELMCI_DMA is not set
-CONFIG_MMC_BLOCK=m
-# 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_NEED_NODE_MEMMAP_SIZE is not set
-CONFIG_NEED_PER_CPU_KM=y
-# CONFIG_NET_DMA is not set
-# CONFIG_NMI_DEBUGGING is not set
-CONFIG_NO_HZ=y
-CONFIG_NR_QUICK=2
-# CONFIG_OWNERSHIP_TRACE is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PERFORMANCE_COUNTERS=y
-CONFIG_PHYLIB=y
-CONFIG_PHYS_OFFSET=0x10000000
-CONFIG_PLATFORM_AT32AP=y
-# CONFIG_PREEMPT_RCU is not set
-CONFIG_QUICKLIST=y
-# CONFIG_QUOTACTL is not set
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AT32AP700X=y
-# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-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_SPI_ATMEL=y
-# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_GPIO is not set
-CONFIG_SPI_MASTER=y
-CONFIG_SUBARCH_AVR32B=y
-CONFIG_XZ_DEC=y
-CONFIG_ZONE_DMA_FLAG=0
+++ /dev/null
---- a/arch/avr32/Kconfig
-+++ b/arch/avr32/Kconfig
-@@ -8,6 +8,7 @@ config AVR32
- select HAVE_KPROBES
- select HAVE_GENERIC_HARDIRQS
- select GENERIC_IRQ_PROBE
-+ select GENERIC_ATOMIC64
- select HARDIRQS_SW_RESEND
- select GENERIC_IRQ_SHOW
- help
---- a/arch/avr32/include/asm/atomic.h
-+++ b/arch/avr32/include/asm/atomic.h
-@@ -197,5 +197,6 @@ static inline int atomic_sub_if_positive
- #define smp_mb__after_atomic_inc() barrier()
-
- #include <asm-generic/atomic-long.h>
-+#include <asm-generic/atomic64.h>
-
- #endif /* __ASM_AVR32_ATOMIC_H */