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

Commit 7217fa98 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm: (48 commits)
  [ARM] S3C24XX: ADC: Check pending queue before freeing adc client
  [ARM] S3C: Fix ADC driver sparse warning
  [ARM] Osiris: Fix double initialisation in machine block
  [ARM] Anubis: Fix sparse warnings for items that should be static
  [ARM] JIVE: Fix sparse warnings about items which should be static
  [ARM] S3C: Fix sparse warning from missing 's3c_device_hwmon'
  [ARM] S3C24XX: Fix sparse error in gpiolib.c
  [ARM] 5455/1: Fix IRQ noise from VIC code
  [ARM] 5454/1: ep93xx_eth: fix sparse warnings
  [ARM] remove .gitignore from include/asm-arm
  Update MAINTAINERS
  mxc defconfig updates
  mx31ads: Mark as having full regulatoion constraints with 1133-EV1 board
  mx31ads: Depend on all the WM8350 core dependencies for WM1133-EV1 board
  Fix ifdef in plat-mxc/irc.c
  MX1ADS: remove I2C ifdefs
  qong: remove AIPS[12] mappings from machine-specific iotable
  mx31ads: imoux pins should be passed in as unsigned int
  MXC: remove orphan imx_init_uart() definition
  mx31: pin definition for csi
  ...
parents 91ec65ba 7f07df54

MAINTAINERS

+63 −8
Original line number Diff line number Diff line
@@ -543,6 +543,14 @@ S: Maintained 
F:	arch/arm/lib/floppydma.S

F:	arch/arm/include/asm/floppy.h



ARM PORT

P:	Russell King

M:	linux@arm.linux.org.uk

L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)

W:	http://www.arm.linux.org.uk/

S:	Maintained

F:	arch/arm/



ARM PRIMECELL MMCI PL180/1 DRIVER

S:	Orphan

F:	drivers/mmc/host/mmci.*
@@ -592,6 +600,13 @@ M: kernel@wantstofly.org 
L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

S:	Maintained



ARM/CLKDEV SUPPORT

P:	Russell King

M:	linux@arm.linux.org.uk

L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)

F:	arch/arm/common/clkdev.c

F:	arch/arm/include/asm/clkdev.h



ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT

P:	Mike Rapoport

M:	mike@compulab.co.il
@@ -610,6 +625,15 @@ L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 
T:	git git://gitorious.org/linux-gemini/mainline.git

S:	Maintained



ARM/EBSA110 MACHINE SUPPORT

P:	Russell King

M:	linux@arm.linux.org.uk

L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)

W:	http://www.arm.linux.org.uk/

S:	Maintained

F:	arch/arm/mach-ebsa110/

F:	drivers/net/arm/am79c961a.*



ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)

P:	Daniel Ribeiro

M:	drwyrm@gmail.com
@@ -627,6 +651,15 @@ M: paulius.zaleckas@teltonika.lt 
L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

S:	Maintained



ARM/FOOTBRIDGE ARCHITECTURE

P:	Russell King

M:	linux@arm.linux.org.uk

L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)

W:	http://www.arm.linux.org.uk/

S:	Maintained

F:	arch/arm/include/asm/hardware/dec21285.h

F:	arch/arm/mach-footbridge/



ARM/FREESCALE IMX / MXC ARM ARCHITECTURE

P:	Sascha Hauer

M:	kernel@pengutronix.de
@@ -767,19 +800,27 @@ M: kernel@wantstofly.org 
L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

S:	Maintained



ARM/RISCPC ARCHITECTURE

P:	Russell King

M:	linux@arm.linux.org.uk

L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)

W:	http://www.arm.linux.org.uk/

S:	Maintained

F:	arch/arm/common/time-acorn.c

F:	arch/arm/include/asm/hardware/entry-macro-iomd.S

F:	arch/arm/include/asm/hardware/ioc.h

F:	arch/arm/include/asm/hardware/iomd.h

F:	arch/arm/include/asm/hardware/memc.h

F:	arch/arm/mach-rpc/

F:	drivers/net/arm/ether*

F:	drivers/scsi/arm/



ARM/SHARK MACHINE SUPPORT

P:	Alexander Schulz

M:	alex@shark-linux.de

W:	http://www.shark-linux.de/shark.html

S:	Maintained



ARM/STRONGARM110 PORT

P:	Russell King

M:	rmk@arm.linux.org.uk

L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)

W:	http://www.arm.linux.org.uk/

S:	Maintained



ARM/S3C2410 ARM ARCHITECTURE

P:	Ben Dooks

M:	ben-linux@fluff.org
@@ -813,6 +854,14 @@ L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 
W:	http://www.mcuos.com

S:	Maintained



ARM/VFP SUPPORT

P:	Russell King

M:	linux@arm.linux.org.uk

L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)

W:	http://www.arm.linux.org.uk/

S:	Maintained

F:	arch/arm/vfp/



ARPD SUPPORT

P:	Jonathan Layes

L:	netdev@vger.kernel.org
@@ -1372,6 +1421,11 @@ S: Maintained 
F:	Documentation/input/cs461x.txt

F:	sound/pci/cs46xx/



CLK API

P:	Russell King

M:	linux@arm.linux.org.uk

F:	include/linux/clk.h



CODA FILE SYSTEM

P:	Jan Harkes

M:	jaharkes@cs.cmu.edu
@@ -1576,7 +1630,8 @@ F: drivers/infiniband/hw/cxgb3/ 


CYBERPRO FB DRIVER

P:	Russell King

M:	rmk@arm.linux.org.uk

M:	linux@arm.linux.org.uk

L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)

W:	http://www.arm.linux.org.uk/

S:	Maintained

F:	drivers/video/cyber2000fb.*

arch/arm/common/vic.c

+4 −5
Original line number Diff line number Diff line
@@ -85,12 +85,11 @@ void __init vic_init(void __iomem *base, unsigned int irq_start, 
	writel(32, base + VIC_PL190_DEF_VECT_ADDR);



	for (i = 0; i < 32; i++) {

		if (vic_sources & (1 << i)) {

			unsigned int irq = irq_start + i;



			set_irq_chip(irq, &vic_chip);

			set_irq_chip_data(irq, base);



		if (vic_sources & (1 << i)) {

			set_irq_handler(irq, handle_level_irq);

			set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);

		}

arch/arm/configs/imx27ads_defconfig

deleted100644 → 0
+0 −826
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.26-rc6

# Fri Jun 20 16:29:34 2008

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y

CONFIG_GENERIC_GPIO=y

CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_MMU=y

# CONFIG_NO_IOPORT is not set

CONFIG_GENERIC_HARDIRQS=y

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_LOCKDEP_SUPPORT=y

CONFIG_TRACE_IRQFLAGS_SUPPORT=y

CONFIG_HARDIRQS_SW_RESEND=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

# CONFIG_ARCH_HAS_ILOG2_U32 is not set

# CONFIG_ARCH_HAS_ILOG2_U64 is not set

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_ARCH_SUPPORTS_AOUT=y

CONFIG_ZONE_DMA=y

CONFIG_ARCH_MTD_XIP=y

CONFIG_VECTORS_BASE=0xffff0000

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"



#

# General setup

#

CONFIG_EXPERIMENTAL=y

CONFIG_BROKEN_ON_SMP=y

CONFIG_LOCK_KERNEL=y

CONFIG_INIT_ENV_ARG_LIMIT=32

CONFIG_LOCALVERSION=""

CONFIG_LOCALVERSION_AUTO=y

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_SYSVIPC_SYSCTL=y

CONFIG_POSIX_MQUEUE=y

# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_TASKSTATS is not set

# CONFIG_AUDIT is not set

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_CGROUPS is not set

# CONFIG_GROUP_SCHED is not set

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

# CONFIG_RELAY is not set

# CONFIG_NAMESPACES is not set

# CONFIG_BLK_DEV_INITRD is not set

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_SYSCTL=y

CONFIG_EMBEDDED=y

CONFIG_UID16=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_KALLSYMS=y

CONFIG_KALLSYMS_EXTRA_PASS=y

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_COMPAT_BRK=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_ANON_INODES=y

CONFIG_EPOLL=y

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y

CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_SLAB=y

# CONFIG_SLUB is not set

# CONFIG_SLOB is not set

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set

CONFIG_HAVE_OPROFILE=y

# CONFIG_KPROBES is not set

CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

# CONFIG_HAVE_DMA_ATTRS is not set

CONFIG_PROC_PAGE_MONITOR=y

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

CONFIG_MODULES=y

# CONFIG_MODULE_FORCE_LOAD is not set

CONFIG_MODULE_UNLOAD=y

# CONFIG_MODULE_FORCE_UNLOAD is not set

# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

# CONFIG_KMOD is not set

CONFIG_BLOCK=y

# CONFIG_LBD is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_LSF is not set

# CONFIG_BLK_DEV_BSG is not set



#

# IO Schedulers

#

CONFIG_IOSCHED_NOOP=y

# CONFIG_IOSCHED_AS is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

# CONFIG_DEFAULT_AS is not set

# CONFIG_DEFAULT_DEADLINE is not set

# CONFIG_DEFAULT_CFQ is not set

CONFIG_DEFAULT_NOOP=y

CONFIG_DEFAULT_IOSCHED="noop"

CONFIG_CLASSIC_RCU=y



#

# System Type

#

# CONFIG_ARCH_AAEC2000 is not set

# CONFIG_ARCH_INTEGRATOR is not set

# CONFIG_ARCH_REALVIEW is not set

# CONFIG_ARCH_VERSATILE is not set

# CONFIG_ARCH_AT91 is not set

# CONFIG_ARCH_CLPS7500 is not set

# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_CO285 is not set

# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_EP93XX is not set

# CONFIG_ARCH_FOOTBRIDGE is not set

# CONFIG_ARCH_NETX is not set

# CONFIG_ARCH_H720X is not set

# CONFIG_ARCH_IMX is not set

# CONFIG_ARCH_IOP13XX is not set

# CONFIG_ARCH_IOP32X is not set

# CONFIG_ARCH_IOP33X is not set

# CONFIG_ARCH_IXP23XX is not set

# CONFIG_ARCH_IXP2000 is not set

# CONFIG_ARCH_IXP4XX is not set

# CONFIG_ARCH_L7200 is not set

# CONFIG_ARCH_KS8695 is not set

# CONFIG_ARCH_NS9XXX is not set

CONFIG_ARCH_MXC=y

# CONFIG_ARCH_ORION5X is not set

# CONFIG_ARCH_PNX4008 is not set

# CONFIG_ARCH_PXA is not set

# CONFIG_ARCH_RPC is not set

# CONFIG_ARCH_SA1100 is not set

# CONFIG_ARCH_S3C2410 is not set

# CONFIG_ARCH_SHARK is not set

# CONFIG_ARCH_LH7A40X is not set

# CONFIG_ARCH_DAVINCI is not set

# CONFIG_ARCH_OMAP is not set

# CONFIG_ARCH_MSM7X00A is not set



#

# Boot options

#



#

# Power management

#



#

# Freescale MXC Implementations

#

CONFIG_ARCH_MX2=y

# CONFIG_ARCH_MX3 is not set



#

# MX2 family CPU support

#

CONFIG_MACH_MX27=y



#

# MX2 Platforms

#

CONFIG_MACH_MX27ADS=y

# CONFIG_MACH_PCM038 is not set



#

# Processor Type

#

CONFIG_CPU_32=y

CONFIG_CPU_ARM926T=y

CONFIG_CPU_32v5=y

CONFIG_CPU_ABRT_EV5TJ=y

CONFIG_CPU_PABRT_NOIFAR=y

CONFIG_CPU_CACHE_VIVT=y

CONFIG_CPU_COPY_V4WB=y

CONFIG_CPU_TLB_V4WBI=y

CONFIG_CPU_CP15=y

CONFIG_CPU_CP15_MMU=y



#

# Processor Features

#

CONFIG_ARM_THUMB=y

# CONFIG_CPU_ICACHE_DISABLE is not set

# CONFIG_CPU_DCACHE_DISABLE is not set

# CONFIG_CPU_DCACHE_WRITETHROUGH is not set

# CONFIG_CPU_CACHE_ROUND_ROBIN is not set

# CONFIG_OUTER_CACHE is not set



#

# Bus support

#

# CONFIG_PCI_SYSCALL is not set

# CONFIG_ARCH_SUPPORTS_MSI is not set

# CONFIG_PCCARD is not set



#

# Kernel Features

#

CONFIG_TICK_ONESHOT=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_GENERIC_CLOCKEVENTS_BUILD=y

CONFIG_PREEMPT=y

CONFIG_HZ=100

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_FLATMEM_MANUAL=y

# CONFIG_DISCONTIGMEM_MANUAL is not set

# CONFIG_SPARSEMEM_MANUAL is not set

CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set

# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set

CONFIG_PAGEFLAGS_EXTENDED=y

CONFIG_SPLIT_PTLOCK_CPUS=4096

# CONFIG_RESOURCES_64BIT is not set

CONFIG_ZONE_DMA_FLAG=1

CONFIG_BOUNCE=y

CONFIG_VIRT_TO_BUS=y

CONFIG_ALIGNMENT_TRAP=y



#

# Boot options

#

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE=""

# CONFIG_XIP_KERNEL is not set

# CONFIG_KEXEC is not set



#

# Floating point emulation

#



#

# At least one emulation must be selected

#

# CONFIG_VFP is not set



#

# Userspace binary formats

#

CONFIG_BINFMT_ELF=y

# CONFIG_BINFMT_AOUT is not set

# CONFIG_BINFMT_MISC is not set



#

# Power management options

#

# CONFIG_PM is not set

CONFIG_ARCH_SUSPEND_POSSIBLE=y



#

# Networking

#

CONFIG_NET=y



#

# Networking options

#

CONFIG_PACKET=y

CONFIG_PACKET_MMAP=y

CONFIG_UNIX=y

# CONFIG_NET_KEY is not set

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

# CONFIG_IP_ADVANCED_ROUTER is not set

CONFIG_IP_FIB_HASH=y

CONFIG_IP_PNP=y

# CONFIG_IP_PNP_DHCP is not set

# CONFIG_IP_PNP_BOOTP is not set

# CONFIG_IP_PNP_RARP is not set

# CONFIG_NET_IPIP is not set

# CONFIG_NET_IPGRE is not set

# CONFIG_IP_MROUTE is not set

# CONFIG_ARPD is not set

# CONFIG_SYN_COOKIES is not set

# CONFIG_INET_AH is not set

# CONFIG_INET_ESP is not set

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_XFRM_TUNNEL is not set

# CONFIG_INET_TUNNEL is not set

# 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_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_CUBIC=y

CONFIG_DEFAULT_TCP_CONG="cubic"

# CONFIG_TCP_MD5SIG is not set

# CONFIG_IPV6 is not set

# CONFIG_NETWORK_SECMARK is not set

# CONFIG_NETFILTER is not set

# CONFIG_IP_DCCP is not set

# CONFIG_IP_SCTP is not set

# CONFIG_TIPC is not set

# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set

# CONFIG_VLAN_8021Q is not set

# CONFIG_DECNET is not set

# CONFIG_LLC2 is not set

# CONFIG_IPX is not set

# CONFIG_ATALK is not set

# CONFIG_X25 is not set

# CONFIG_LAPB is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set

# CONFIG_NET_SCHED is not set



#

# Network testing

#

# CONFIG_NET_PKTGEN is not set

# CONFIG_HAMRADIO is not set

# CONFIG_CAN is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set



#

# Wireless

#

# CONFIG_CFG80211 is not set

# CONFIG_WIRELESS_EXT is not set

# CONFIG_MAC80211 is not set

# CONFIG_IEEE80211 is not set

# CONFIG_RFKILL is not set

# CONFIG_NET_9P is not set



#

# Device Drivers

#



#

# Generic Driver Options

#

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

# CONFIG_FW_LOADER is not set

# CONFIG_SYS_HYPERVISOR is not set

# CONFIG_CONNECTOR is not set

CONFIG_MTD=y

# CONFIG_MTD_DEBUG is not set

# CONFIG_MTD_CONCAT is not set

CONFIG_MTD_PARTITIONS=y

# CONFIG_MTD_REDBOOT_PARTS is not set

CONFIG_MTD_CMDLINE_PARTS=y

# CONFIG_MTD_AFS_PARTS is not set

# CONFIG_MTD_AR7_PARTS is not set



#

# User Modules And Translation Layers

#

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLKDEVS=y

CONFIG_MTD_BLOCK=y

# CONFIG_FTL is not set

# CONFIG_NFTL is not set

# CONFIG_INFTL is not set

# CONFIG_RFD_FTL is not set

# CONFIG_SSFDC is not set

# CONFIG_MTD_OOPS is not set



#

# RAM/ROM/Flash chip drivers

#

CONFIG_MTD_CFI=y

# CONFIG_MTD_JEDECPROBE is not set

CONFIG_MTD_GEN_PROBE=y

CONFIG_MTD_CFI_ADV_OPTIONS=y

CONFIG_MTD_CFI_NOSWAP=y

# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set

# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set

CONFIG_MTD_CFI_GEOMETRY=y

# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set

CONFIG_MTD_MAP_BANK_WIDTH_2=y

# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set

# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set

# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set

# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set

CONFIG_MTD_CFI_I1=y

# CONFIG_MTD_CFI_I2 is not set

# CONFIG_MTD_CFI_I4 is not set

# CONFIG_MTD_CFI_I8 is not set

# CONFIG_MTD_OTP is not set

CONFIG_MTD_CFI_INTELEXT=y

# CONFIG_MTD_CFI_AMDSTD is not set

# CONFIG_MTD_CFI_STAA is not set

CONFIG_MTD_CFI_UTIL=y

# CONFIG_MTD_RAM is not set

# CONFIG_MTD_ROM is not set

# CONFIG_MTD_ABSENT is not set

# CONFIG_MTD_XIP is not set



#

# Mapping drivers for chip access

#

# CONFIG_MTD_COMPLEX_MAPPINGS is not set

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_PHYSMAP_START=0x00000000

CONFIG_MTD_PHYSMAP_LEN=0x0

CONFIG_MTD_PHYSMAP_BANKWIDTH=2

# CONFIG_MTD_ARM_INTEGRATOR is not set

# CONFIG_MTD_PLATRAM is not set



#

# Self-contained MTD device drivers

#

# CONFIG_MTD_SLRAM is not set

# CONFIG_MTD_PHRAM is not set

# CONFIG_MTD_MTDRAM is not set

# CONFIG_MTD_BLOCK2MTD is not set



#

# Disk-On-Chip Device Drivers

#

# CONFIG_MTD_DOC2000 is not set

# CONFIG_MTD_DOC2001 is not set

# CONFIG_MTD_DOC2001PLUS is not set

# CONFIG_MTD_NAND is not set

# CONFIG_MTD_ONENAND is not set



#

# UBI - Unsorted block images

#

# CONFIG_MTD_UBI is not set

# CONFIG_PARPORT is not set

CONFIG_BLK_DEV=y

# CONFIG_BLK_DEV_COW_COMMON is not set

# CONFIG_BLK_DEV_LOOP is not set

# CONFIG_BLK_DEV_NBD is not set

# CONFIG_BLK_DEV_RAM is not set

# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set

# CONFIG_MISC_DEVICES is not set

CONFIG_HAVE_IDE=y

# CONFIG_IDE is not set



#

# SCSI device support

#

# CONFIG_RAID_ATTRS is not set

# CONFIG_SCSI is not set

# CONFIG_SCSI_DMA is not set

# CONFIG_SCSI_NETLINK is not set

# CONFIG_ATA is not set

# CONFIG_MD is not set

CONFIG_NETDEVICES=y

# CONFIG_NETDEVICES_MULTIQUEUE is not set

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

# CONFIG_MACVLAN is not set

# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set

# CONFIG_VETH is not set

# CONFIG_PHYLIB is not set

CONFIG_NET_ETHERNET=y

# CONFIG_MII is not set

# CONFIG_AX88796 is not set

# CONFIG_SMC91X is not set

# CONFIG_DM9000 is not set

# CONFIG_IBM_NEW_EMAC_ZMII is not set

# CONFIG_IBM_NEW_EMAC_RGMII is not set

# CONFIG_IBM_NEW_EMAC_TAH is not set

# CONFIG_IBM_NEW_EMAC_EMAC4 is not set

# CONFIG_B44 is not set

# CONFIG_FEC_OLD is not set

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set



#

# Wireless LAN

#

# CONFIG_WLAN_PRE80211 is not set

# CONFIG_WLAN_80211 is not set

# CONFIG_IWLWIFI_LEDS is not set

# CONFIG_WAN is not set

# CONFIG_PPP is not set

# CONFIG_SLIP is not set

# CONFIG_NETCONSOLE is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set

# CONFIG_ISDN is not set



#

# Input device support

#

CONFIG_INPUT=y

# CONFIG_INPUT_FF_MEMLESS is not set

# CONFIG_INPUT_POLLDEV is not set



#

# Userland interfaces

#

# CONFIG_INPUT_MOUSEDEV is not set

# CONFIG_INPUT_JOYDEV is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_EVBUG is not set



#

# Input Device Drivers

#

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_INPUT_JOYSTICK is not set

# CONFIG_INPUT_TABLET is not set

CONFIG_INPUT_TOUCHSCREEN=y

# CONFIG_TOUCHSCREEN_FUJITSU is not set

# CONFIG_TOUCHSCREEN_GUNZE is not set

# CONFIG_TOUCHSCREEN_ELO is not set

# CONFIG_TOUCHSCREEN_MTOUCH is not set

# CONFIG_TOUCHSCREEN_MK712 is not set

# CONFIG_TOUCHSCREEN_PENMOUNT is not set

# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set

# CONFIG_TOUCHSCREEN_TOUCHWIN is not set

# CONFIG_TOUCHSCREEN_UCB1400 is not set

# CONFIG_INPUT_MISC is not set



#

# Hardware I/O ports

#

# CONFIG_SERIO is not set

# CONFIG_GAMEPORT is not set



#

# Character devices

#

# CONFIG_VT is not set

CONFIG_DEVKMEM=y

# CONFIG_SERIAL_NONSTANDARD is not set



#

# Serial drivers

#

# CONFIG_SERIAL_8250 is not set



#

# Non-8250 serial port support

#

# CONFIG_SERIAL_IMX is not set

CONFIG_UNIX98_PTYS=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_IPMI_HANDLER is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_NVRAM is not set

# CONFIG_R3964 is not set

# CONFIG_RAW_DRIVER is not set

# CONFIG_TCG_TPM is not set

# CONFIG_I2C is not set

# CONFIG_SPI is not set

CONFIG_HAVE_GPIO_LIB=y



#

# GPIO Support

#



#

# I2C GPIO expanders:

#



#

# SPI GPIO expanders:

#

# CONFIG_W1 is not set

# CONFIG_POWER_SUPPLY is not set

# CONFIG_HWMON is not set

# CONFIG_WATCHDOG is not set



#

# Sonics Silicon Backplane

#

CONFIG_SSB_POSSIBLE=y

# CONFIG_SSB is not set



#

# Multifunction device drivers

#

# CONFIG_MFD_SM501 is not set

# CONFIG_MFD_ASIC3 is not set

# CONFIG_HTC_EGPIO is not set

# CONFIG_HTC_PASIC3 is not set



#

# Multimedia devices

#



#

# Multimedia core support

#

# CONFIG_VIDEO_DEV is not set

# CONFIG_DVB_CORE is not set

# CONFIG_VIDEO_MEDIA is not set



#

# Multimedia drivers

#

# CONFIG_DAB is not set



#

# Graphics support

#

# CONFIG_VGASTATE is not set

# CONFIG_VIDEO_OUTPUT_CONTROL is not set

# CONFIG_FB is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Display device support

#

# CONFIG_DISPLAY_SUPPORT is not set



#

# Sound

#

# CONFIG_SOUND is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

# CONFIG_MMC is not set

# CONFIG_NEW_LEDS is not set

CONFIG_RTC_LIB=y

# CONFIG_RTC_CLASS is not set

# CONFIG_UIO is not set



#

# File systems

#

# CONFIG_EXT2_FS is not set

# CONFIG_EXT3_FS is not set

# CONFIG_EXT4DEV_FS is not set

# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set

# CONFIG_FS_POSIX_ACL is not set

# CONFIG_XFS_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY is not set

# CONFIG_QUOTA is not set

# CONFIG_AUTOFS_FS is not set

# CONFIG_AUTOFS4_FS is not set

# CONFIG_FUSE_FS is not set



#

# CD-ROM/DVD Filesystems

#

# CONFIG_ISO9660_FS is not set

# CONFIG_UDF_FS is not set



#

# DOS/FAT/NT Filesystems

#

# CONFIG_MSDOS_FS is not set

# CONFIG_VFAT_FS is not set

# CONFIG_NTFS_FS is not set



#

# Pseudo filesystems

#

CONFIG_PROC_FS=y

CONFIG_PROC_SYSCTL=y

CONFIG_SYSFS=y

CONFIG_TMPFS=y

# CONFIG_TMPFS_POSIX_ACL is not set

# CONFIG_HUGETLB_PAGE is not set

# CONFIG_CONFIGFS_FS is not set



#

# Miscellaneous filesystems

#

# CONFIG_ADFS_FS is not set

# CONFIG_AFFS_FS is not set

# CONFIG_HFS_FS is not set

# CONFIG_HFSPLUS_FS is not set

# CONFIG_BEFS_FS is not set

# CONFIG_BFS_FS is not set

# CONFIG_EFS_FS is not set

CONFIG_JFFS2_FS=y

CONFIG_JFFS2_FS_DEBUG=0

CONFIG_JFFS2_FS_WRITEBUFFER=y

# CONFIG_JFFS2_FS_WBUF_VERIFY is not set

# CONFIG_JFFS2_SUMMARY is not set

# CONFIG_JFFS2_FS_XATTR is not set

# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set

CONFIG_JFFS2_ZLIB=y

# CONFIG_JFFS2_LZO is not set

CONFIG_JFFS2_RTIME=y

# CONFIG_JFFS2_RUBIN is not set

# CONFIG_CRAMFS is not set

# CONFIG_VXFS_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_HPFS_FS is not set

# CONFIG_QNX4FS_FS is not set

# CONFIG_ROMFS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

# CONFIG_NFS_V3_ACL is not set

# CONFIG_NFS_V4 is not set

# CONFIG_NFSD is not set

CONFIG_ROOT_NFS=y

CONFIG_LOCKD=y

CONFIG_LOCKD_V4=y

CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=y

# CONFIG_SUNRPC_BIND34 is not set

# CONFIG_RPCSEC_GSS_KRB5 is not set

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set

# CONFIG_CIFS is not set

# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set

# CONFIG_AFS_FS is not set



#

# Partition Types

#

# CONFIG_PARTITION_ADVANCED is not set

CONFIG_MSDOS_PARTITION=y

CONFIG_NLS=y

CONFIG_NLS_DEFAULT="iso8859-1"

CONFIG_NLS_CODEPAGE_437=m

# CONFIG_NLS_CODEPAGE_737 is not set

# CONFIG_NLS_CODEPAGE_775 is not set

CONFIG_NLS_CODEPAGE_850=m

# CONFIG_NLS_CODEPAGE_852 is not set

# CONFIG_NLS_CODEPAGE_855 is not set

# CONFIG_NLS_CODEPAGE_857 is not set

# CONFIG_NLS_CODEPAGE_860 is not set

# CONFIG_NLS_CODEPAGE_861 is not set

# CONFIG_NLS_CODEPAGE_862 is not set

# CONFIG_NLS_CODEPAGE_863 is not set

# CONFIG_NLS_CODEPAGE_864 is not set

# CONFIG_NLS_CODEPAGE_865 is not set

# CONFIG_NLS_CODEPAGE_866 is not set

# CONFIG_NLS_CODEPAGE_869 is not set

# CONFIG_NLS_CODEPAGE_936 is not set

# CONFIG_NLS_CODEPAGE_950 is not set

# CONFIG_NLS_CODEPAGE_932 is not set

# CONFIG_NLS_CODEPAGE_949 is not set

# CONFIG_NLS_CODEPAGE_874 is not set

# CONFIG_NLS_ISO8859_8 is not set

# CONFIG_NLS_CODEPAGE_1250 is not set

# CONFIG_NLS_CODEPAGE_1251 is not set

# CONFIG_NLS_ASCII is not set

CONFIG_NLS_ISO8859_1=y

# CONFIG_NLS_ISO8859_2 is not set

# CONFIG_NLS_ISO8859_3 is not set

# CONFIG_NLS_ISO8859_4 is not set

# CONFIG_NLS_ISO8859_5 is not set

# CONFIG_NLS_ISO8859_6 is not set

# CONFIG_NLS_ISO8859_7 is not set

# CONFIG_NLS_ISO8859_9 is not set

# CONFIG_NLS_ISO8859_13 is not set

# CONFIG_NLS_ISO8859_14 is not set

CONFIG_NLS_ISO8859_15=m

# CONFIG_NLS_KOI8_R is not set

# CONFIG_NLS_KOI8_U is not set

# CONFIG_NLS_UTF8 is not set

# CONFIG_DLM is not set



#

# Kernel hacking

#

# CONFIG_PRINTK_TIME is not set

CONFIG_ENABLE_WARN_DEPRECATED=y

CONFIG_ENABLE_MUST_CHECK=y

CONFIG_FRAME_WARN=1024

# CONFIG_MAGIC_SYSRQ is not set

# CONFIG_UNUSED_SYMBOLS is not set

# CONFIG_DEBUG_FS is not set

# CONFIG_HEADERS_CHECK is not set

# CONFIG_DEBUG_KERNEL is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_FRAME_POINTER=y

# CONFIG_SAMPLES is not set

# CONFIG_DEBUG_USER is not set



#

# Security options

#

# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

# CONFIG_CRYPTO is not set



#

# Library routines

#

CONFIG_BITREVERSE=y

# CONFIG_GENERIC_FIND_FIRST_BIT is not set

# CONFIG_GENERIC_FIND_NEXT_BIT is not set

# CONFIG_CRC_CCITT is not set

# CONFIG_CRC16 is not set

# CONFIG_CRC_ITU_T is not set

CONFIG_CRC32=y

# CONFIG_CRC7 is not set

# CONFIG_LIBCRC32C is not set

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=y

CONFIG_PLIST=y

CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

arch/arm/configs/mx31ads_defconfig→arch/arm/configs/mx1_defconfig

+401 −135

File changed and moved.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/pcm038_defconfig→arch/arm/configs/mx27_defconfig

+260 −94

File changed and moved.

Preview size limit exceeded, changes collapsed.