Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8287361a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'headers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC Header cleanups from Olof Johansson:
 "This is a collection of header file cleanups, mostly for OMAP and
  AT91, that keeps moving the platforms in the direction of
  multiplatform by removing the need for mach-dependent header files
  used in drivers and other places."

Fix up mostly trivial conflicts as per Olof.

* tag 'headers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (106 commits)
  ARM: OMAP2+: Move iommu/iovmm headers to platform_data
  ARM: OMAP2+: Make some definitions local
  ARM: OMAP2+: Move iommu2 to drivers/iommu/omap-iommu2.c
  ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h
  ARM: OMAP2+: Move iopgtable header to drivers/iommu/
  ARM: OMAP: Merge iommu2.h into iommu.h
  atmel: move ATMEL_MAX_UART to platform_data/atmel.h
  ARM: OMAP: Remove omap_init_consistent_dma_size()
  arm: at91: move at91rm9200 rtc header in drivers/rtc
  arm: at91: move reset controller header to arm/arm/mach-at91
  arm: at91: move pit define to the driver
  arm: at91: move at91_shdwc.h to arch/arm/mach-at91
  arm: at91: move board header to arch/arm/mach-at91
  arn: at91: move at91_tc.h to arch/arm/mach-at91
  arm: at91 move at91_aic.h to arch/arm/mach-at91
  arm: at91 move board.h to arch/arm/mach-at91
  arm: at91: move platfarm_data to include/linux/platform_data/atmel.h
  arm: at91: drop machine defconfig
  ARM: OMAP: Remove NEED_MACH_GPIO_H
  ARM: OMAP: Remove unnecessary mach and plat includes
  ...
parents 2989950c 8556650d

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -945,7 +945,6 @@ config ARCH_OMAP 
	select CLKSRC_MMIO

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select NEED_MACH_GPIO_H

	help

	  Support for TI's OMAP platform (OMAP1/2/3/4).

arch/arm/configs/afeb9260_defconfig

deleted100644 → 0
+0 −106
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_AT91=y

CONFIG_ARCH_AT91SAM9260=y

CONFIG_MACH_AFEB9260=y

CONFIG_AT91_PROGRAMMABLE_CLOCKS=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"

CONFIG_FPE_NWFPE=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_BOOTP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_IPV6 is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_DATAFLASH=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_ATMEL=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_ATMEL_SSC=y

CONFIG_EEPROM_AT24=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_SCSI_MULTI_LUN=y

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

CONFIG_MACB=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

CONFIG_SERIAL_ATMEL=y

CONFIG_SERIAL_ATMEL_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_GPIO=y

CONFIG_SPI=y

CONFIG_SPI_DEBUG=y

CONFIG_SPI_ATMEL=y

CONFIG_SPI_SPIDEV=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y

# CONFIG_VGA_CONSOLE is not set

# CONFIG_USB_HID is not set

CONFIG_USB=y

CONFIG_USB_DEVICEFS=y

CONFIG_USB_MON=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_USB_GADGET=y

CONFIG_USB_ZERO=m

CONFIG_USB_GADGETFS=m

CONFIG_USB_MASS_STORAGE=m

CONFIG_USB_G_SERIAL=m

CONFIG_RTC_CLASS=y

CONFIG_RTC_DEBUG=y

CONFIG_RTC_DRV_FM3130=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_INOTIFY=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_CRAMFS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_CODEPAGE_850=y

CONFIG_NLS_ISO8859_1=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_INFO=y

CONFIG_SYSCTL_SYSCALL_CHECK=y

# CONFIG_FTRACE is not set

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_LL=y

CONFIG_CRC_T10DIF=y

arch/arm/configs/cam60_defconfig

deleted100644 → 0
+0 −173
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BSD_PROCESS_ACCT_V3=y

CONFIG_AUDIT=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_BLK_DEV_INITRD=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_KALLSYMS_ALL=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_AT91=y

CONFIG_ARCH_AT91SAM9260=y

CONFIG_MACH_CAM60=y

CONFIG_ZBOOT_ROM_BSS=0x20004000

CONFIG_CMDLINE="console=ttyS0,115200 noinitrd root=/dev/mtdblock0 rootfstype=jffs2 mem=64M"

CONFIG_FPE_NWFPE=y

CONFIG_BINFMT_AOUT=y

CONFIG_BINFMT_MISC=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

CONFIG_NETWORK_SECMARK=y

CONFIG_CFG80211=m

CONFIG_MAC80211=m

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD_CONCAT=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_COMPLEX_MAPPINGS=y

CONFIG_MTD_PLATRAM=m

CONFIG_MTD_DATAFLASH=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_ATMEL=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

# CONFIG_MISC_DEVICES is not set

CONFIG_SCSI=y

CONFIG_SCSI_TGT=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

CONFIG_CHR_DEV_SCH=y

CONFIG_SCSI_MULTI_LUN=y

CONFIG_SCSI_LOGGING=y

CONFIG_SCSI_SCAN_ASYNC=y

CONFIG_SCSI_SPI_ATTRS=m

CONFIG_SCSI_FC_ATTRS=m

CONFIG_SCSI_ISCSI_ATTRS=m

CONFIG_SCSI_SAS_LIBSAS=m

# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

CONFIG_MARVELL_PHY=m

CONFIG_DAVICOM_PHY=m

CONFIG_QSEMI_PHY=m

CONFIG_LXT_PHY=m

CONFIG_CICADA_PHY=m

CONFIG_VITESSE_PHY=m

CONFIG_SMSC_PHY=m

CONFIG_BROADCOM_PHY=m

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

CONFIG_MACB=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_LKKBD=m

CONFIG_KEYBOARD_NEWTON=m

CONFIG_KEYBOARD_STOWAWAY=m

CONFIG_KEYBOARD_SUNKBD=m

CONFIG_KEYBOARD_XTKBD=m

CONFIG_MOUSE_SERIAL=m

CONFIG_MOUSE_APPLETOUCH=m

CONFIG_MOUSE_VSXXXAA=m

# CONFIG_SERIO_SERPORT is not set

CONFIG_VT_HW_CONSOLE_BINDING=y

CONFIG_SERIAL_NONSTANDARD=y

CONFIG_SERIAL_ATMEL=y

CONFIG_SERIAL_ATMEL_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_HW_RANDOM=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_SPI=y

CONFIG_SPI_ATMEL=y

# CONFIG_HWMON is not set

# CONFIG_VGA_CONSOLE is not set

# CONFIG_HID_SUPPORT is not set

CONFIG_USB=y

CONFIG_USB_DEVICEFS=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_USB_LIBUSUAL=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_INTF_DEV_UIE_EMUL=y

CONFIG_RTC_DRV_TEST=m

CONFIG_RTC_DRV_AT91SAM9=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT3_FS=y

CONFIG_INOTIFY=y

CONFIG_QUOTA=y

CONFIG_AUTOFS_FS=y

CONFIG_AUTOFS4_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_CONFIGFS_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_DEFAULT="cp437"

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_UTF8=y

CONFIG_PRINTK_TIME=y

# CONFIG_ENABLE_MUST_CHECK is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_UNUSED_SYMBOLS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_DEBUG_LL=y

CONFIG_CRYPTO=y

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CBC=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_SHA1=y

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_SHA512=y

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_DES=y

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_DEFLATE=m

# CONFIG_CRYPTO_HW is not set

CONFIG_CRC32=m

CONFIG_LIBCRC32C=m

arch/arm/configs/cpu9260_defconfig

deleted100644 → 0
+0 −116
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_AT91=y

CONFIG_ARCH_AT91SAM9260=y

CONFIG_MACH_CPU9260=y

# CONFIG_ARM_THUMB is not set

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_IPV6 is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_PLATRAM=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_ATMEL=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_NBD=y

CONFIG_BLK_DEV_RAM=y

# CONFIG_MISC_DEVICES is not set

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_SCSI_MULTI_LUN=y

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

CONFIG_SMSC_PHY=y

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

CONFIG_MACB=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

CONFIG_PPP=y

CONFIG_PPP_ASYNC=y

CONFIG_PPP_DEFLATE=y

CONFIG_PPP_BSDCOMP=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_KEYBOARD_ATKBD is not set

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

CONFIG_SERIAL_ATMEL=y

CONFIG_SERIAL_ATMEL_CONSOLE=y

CONFIG_LEGACY_PTY_COUNT=32

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_GPIO=y

CONFIG_GPIO_SYSFS=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_AT91SAM9X_WATCHDOG=y

# CONFIG_VGA_CONSOLE is not set

# CONFIG_HID_SUPPORT is not set

CONFIG_USB=y

# CONFIG_USB_DEVICE_CLASS is not set

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_USB_GADGET=y

CONFIG_USB_ETH=m

CONFIG_MMC=y

CONFIG_MMC_ATMELMCI=m

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_GPIO=y

CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

CONFIG_RTC_CLASS=y

# CONFIG_RTC_HCTOSYS is not set

CONFIG_RTC_DRV_DS1307=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_FS_XATTR is not set

CONFIG_INOTIFY=y

CONFIG_AUTOFS4_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_JFFS2_SUMMARY=y

CONFIG_CRAMFS=y

CONFIG_MINIX_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_ROOT_NFS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_UTF8=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

arch/arm/configs/cpu9g20_defconfig

deleted100644 → 0
+0 −116
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_AT91=y

CONFIG_ARCH_AT91SAM9G20=y

CONFIG_MACH_CPU9G20=y

# CONFIG_ARM_THUMB is not set

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_IPV6 is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_PLATRAM=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_ATMEL=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_NBD=y

CONFIG_BLK_DEV_RAM=y

# CONFIG_MISC_DEVICES is not set

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_SCSI_MULTI_LUN=y

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

CONFIG_SMSC_PHY=y

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

CONFIG_MACB=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

CONFIG_PPP=y

CONFIG_PPP_ASYNC=y

CONFIG_PPP_DEFLATE=y

CONFIG_PPP_BSDCOMP=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_KEYBOARD_ATKBD is not set

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

CONFIG_SERIAL_ATMEL=y

CONFIG_SERIAL_ATMEL_CONSOLE=y

CONFIG_LEGACY_PTY_COUNT=32

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_GPIO=y

CONFIG_GPIO_SYSFS=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_AT91SAM9X_WATCHDOG=y

# CONFIG_VGA_CONSOLE is not set

# CONFIG_HID_SUPPORT is not set

CONFIG_USB=y

# CONFIG_USB_DEVICE_CLASS is not set

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_USB_GADGET=y

CONFIG_USB_ETH=m

CONFIG_MMC=y

CONFIG_MMC_ATMELMCI=m

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_GPIO=y

CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

CONFIG_RTC_CLASS=y

# CONFIG_RTC_HCTOSYS is not set

CONFIG_RTC_DRV_DS1307=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_FS_XATTR is not set

CONFIG_INOTIFY=y

CONFIG_AUTOFS4_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_JFFS2_SUMMARY=y

CONFIG_CRAMFS=y

CONFIG_MINIX_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_ROOT_NFS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_UTF8=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set