Merge branch 'for-rmk-next' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable

CONFIG_MACH_MX27=y

CONFIG_MACH_MX27=y

CONFIG_MACH_MX27ADS=y

CONFIG_MACH_MX27ADS=y

CONFIG_MACH_PCM038=y

CONFIG_MACH_PCM038=y

CONFIG_MACH_CPUIMX27=y

CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2=y

CONFIG_MACH_EUKREA_CPUIMX27_USEUART4=y

CONFIG_MACH_MX27_3DS=y

CONFIG_MACH_MX27_3DS=y

CONFIG_MACH_IMX27_VISSTRIM_M10=y

CONFIG_MACH_IMX27LITE=y

CONFIG_MACH_IMX27LITE=y

CONFIG_MACH_PCA100=y

CONFIG_MACH_MXT_TD60=y

CONFIG_MXC_IRQ_PRIOR=y

CONFIG_MXC_IRQ_PRIOR=y

CONFIG_MXC_PWM=y

CONFIG_MXC_PWM=y

CONFIG_NO_HZ=y

CONFIG_NO_HZ=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ADS7846=m

# CONFIG_SERIO is not set

# CONFIG_SERIO is not set

CONFIG_SERIAL_8250=m

CONFIG_SERIAL_IMX=y

CONFIG_SERIAL_IMX=y

CONFIG_SERIAL_IMX_CONSOLE=y

CONFIG_SERIAL_IMX_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_IMX=y

CONFIG_I2C_IMX=y

CONFIG_SPI=y

CONFIG_SPI=y

CONFIG_SPI_BITBANG=y

CONFIG_SPI_IMX=y

CONFIG_W1=y

CONFIG_W1=y

CONFIG_W1_MASTER_MXC=y

CONFIG_W1_MASTER_MXC=y

CONFIG_W1_SLAVE_THERM=y

CONFIG_W1_SLAVE_THERM=y

# CONFIG_HWMON is not set

# CONFIG_HWMON is not set

CONFIG_FB=y

CONFIG_FB=y

CONFIG_FB_IMX=y

CONFIG_FB_IMX=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FONTS=y

CONFIG_FONTS=y

CONFIG_FONT_8x8=y

CONFIG_FONT_8x8=y

# CONFIG_HID_SUPPORT is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_USB=m

# CONFIG_USB_DEVICE_CLASS is not set

CONFIG_USB_ULPI=y

CONFIG_MMC=y

CONFIG_MMC=y

CONFIG_MMC_MXC=y

CONFIG_MMC_MXC=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_CLASS=y

# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_SWAP is not set

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

# CONFIG_COMPAT_BRK is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_MXC=y

# CONFIG_MACH_MX31ADS is not set

CONFIG_MACH_MX31_3DS=y

CONFIG_AEABI=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

# CONFIG_INET_LRO is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FIRMWARE_IN_KERNEL is not set

# CONFIG_BLK_DEV is not set

# CONFIG_MISC_DEVICES is not set

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

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

CONFIG_SERIAL_IMX=y

CONFIG_SERIAL_IMX_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

# CONFIG_VGA_CONSOLE is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

# CONFIG_DNOTIFY is not set

# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

# CONFIG_CRYPTO_ANSI_CPRNG is not set

# CONFIG_CRC32 is not set

CONFIG_MACH_ARMADILLO5X0=y

CONFIG_MACH_ARMADILLO5X0=y

CONFIG_MACH_MX35_3DS=y

CONFIG_MACH_MX35_3DS=y

CONFIG_MACH_KZM_ARM11_01=y

CONFIG_MACH_KZM_ARM11_01=y

CONFIG_MACH_EUKREA_CPUIMX35=y

CONFIG_MXC_IRQ_PRIOR=y

CONFIG_MXC_IRQ_PRIOR=y

CONFIG_MXC_PWM=y

CONFIG_MXC_PWM=y

CONFIG_NO_HZ=y

CONFIG_NO_HZ=y

CONFIG_MMC_MXC=y

CONFIG_MMC_MXC=y

CONFIG_DMADEVICES=y

CONFIG_DMADEVICES=y

# CONFIG_DNOTIFY is not set

# CONFIG_DNOTIFY is not set

CONFIG_INOTIFY=y

CONFIG_TMPFS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_JFFS2_FS=y

CONFIG_UBIFS_FS=y

CONFIG_UBIFS_FS=y

CONFIG_ARCH_MXC=y

CONFIG_ARCH_MXC=y

CONFIG_ARCH_MX5=y

CONFIG_ARCH_MX5=y

CONFIG_MACH_MX51_BABBAGE=y

CONFIG_MACH_MX51_BABBAGE=y

CONFIG_MACH_MX51_3DS=y

CONFIG_MACH_EUKREA_CPUIMX51=y

CONFIG_NO_HZ=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_PREEMPT_VOLUNTARY=y

CONFIG_PREEMPT_VOLUNTARY=y

CONFIG_NATIONAL_PHY=y

CONFIG_NATIONAL_PHY=y

CONFIG_STE10XP=y

CONFIG_STE10XP=y

CONFIG_LSI_ET1011C_PHY=y

CONFIG_LSI_ET1011C_PHY=y

CONFIG_FIXED_PHY=y

CONFIG_MDIO_BITBANG=y

CONFIG_MDIO_BITBANG=y

CONFIG_MDIO_GPIO=y

CONFIG_MDIO_GPIO=y

CONFIG_NET_ETHERNET=y

CONFIG_NET_ETHERNET=y

CONFIG_I2C_ALGOPCA=m

CONFIG_I2C_ALGOPCA=m

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_SYSFS=y

# CONFIG_HWMON is not set

# CONFIG_HWMON is not set

# CONFIG_VGA_CONSOLE is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_HID_SUPPORT is not set

CONFIG_USB=y

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_HCD=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT2_FS_SECURITY=y

CONFIG_EXT2_FS_SECURITY=y

CONFIG_EXT3_FS=y

CONFIG_EXT3_FS=y

CONFIG_EXT3_DEFAULTS_TO_ORDERED=y

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

CONFIG_EXT3_FS_SECURITY=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_INOTIFY=y

CONFIG_QUOTA=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set

# CONFIG_PRINT_QUOTA_WARNING is not set

CONFIG_UDF_FS=m

CONFIG_UDF_FS=m

CONFIG_MSDOS_FS=m

CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_CONFIGFS_FS=m

CONFIG_CONFIGFS_FS=m

CONFIG_NFS_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V3=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_KERNEL=y

# CONFIG_DETECT_SOFTLOCKUP is not set

# CONFIG_SCHED_DEBUG is not set

# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

# CONFIG_ARM_UNWIND is not set

# CONFIG_ARM_UNWIND is not set

CONFIG_DEBUG_LL=y

CONFIG_DEBUG_LL=y

CONFIG_EARLY_PRINTK=y

CONFIG_EARLY_PRINTK=y

CONFIG_KEYS=y

CONFIG_SECURITYFS=y

CONFIG_SECURITYFS=y

CONFIG_CRYPTO_DEFLATE=y

CONFIG_CRYPTO_DEFLATE=y

CONFIG_CRYPTO_LZO=y

CONFIG_CRYPTO_LZO=y

	default MACH_EUKREA_MBIMX27_BASEBOARD

	default MACH_EUKREA_MBIMX27_BASEBOARD

config MACH_EUKREA_MBIMX27_BASEBOARD

config MACH_EUKREA_MBIMX27_BASEBOARD

	prompt "Eukrea MBIMX27 development board"

	bool "Eukrea MBIMX27 development board"

	bool

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_SPI_IMX

	select IMX_HAVE_PLATFORM_SPI_IMX

	help

	help

	  Include support for MX27PDK platform. This includes specific

	  Include support for MX27PDK platform. This includes specific

	  configurations for the board and its peripherals.

	  configurations for the board and its peripherals.

config MACH_IMX27_VISSTRIM_M10

	bool "Vista Silicon i.MX27 Visstrim_m10"

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	help

	  Include support for Visstrim_m10 platform and its different variants.

	  This includes specific configurations for the board and its

	  peripherals.

config MACH_IMX27LITE

config MACH_IMX27LITE

	bool "LogicPD MX27 LITEKIT platform"

	bool "LogicPD MX27 LITEKIT platform"

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_UART

config MACH_PCA100

config MACH_PCA100

	bool "Phytec phyCARD-s (pca100)"

	bool "Phytec phyCARD-s (pca100)"

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_SPI_IMX

	select IMX_HAVE_PLATFORM_SPI_IMX