Merge branch 'next-s3c24xx' into for-next

#define IRQ_S3C2416_HSMMC0	S3C2410_IRQ(21)		/* S3C2416/S3C2450 */

#define IRQ_HSMMC0		IRQ_S3C2443_HSMMC

#define IRQ_HSMMC1		IRQ_S3C2416_HSMMC0

#define IRQ_HSMMC0		IRQ_S3C2416_HSMMC0

#define IRQ_HSMMC1		IRQ_S3C2443_HSMMC

#define IRQ_S3C2443_LCD1	S3C2410_IRQSUB(14)

#define IRQ_S3C2443_LCD2	S3C2410_IRQSUB(15)

#define S3C_PA_IIC          S3C2410_PA_IIC

#define S3C_PA_UART	    S3C24XX_PA_UART

#define S3C_PA_USBHOST	S3C2410_PA_USBHOST

#define S3C_PA_HSMMC0	    S3C2443_PA_HSMMC

#define S3C_PA_HSMMC1	    S3C2416_PA_HSMMC0

#define S3C_PA_HSMMC0	    S3C2416_PA_HSMMC0

#define S3C_PA_HSMMC1	    S3C2443_PA_HSMMC

#define S3C_PA_WDT	    S3C2410_PA_WATCHDOG

#define S3C_PA_NAND	    S3C24XX_PA_NAND

#define S3C2443_HCLKCON_LCDC		(1<<9)

#define S3C2443_HCLKCON_USBH		(1<<11)

#define S3C2443_HCLKCON_USBD		(1<<12)

#define S3C2416_HCLKCON_HSMMC0		(1<<15)

#define S3C2443_HCLKCON_HSMMC		(1<<16)

#define S3C2443_HCLKCON_CFC		(1<<17)

#define S3C2443_HCLKCON_SSMC		(1<<18)

	help

	  Internal config node to apply S3C2416 power management

config S3C2416_SETUP_SDHCI

	bool

	select S3C2416_SETUP_SDHCI_GPIO

	help

	  Internal helper functions for S3C2416 based SDHCI systems

config S3C2416_SETUP_SDHCI_GPIO

	bool

	help

	  Common setup code for SDHCI gpio.

menu "S3C2416 Machines"

config MACH_SMDK2416

	select S3C_DEV_HSMMC1

	select S3C_DEV_NAND

	select S3C_DEV_USB_HOST

	select S3C2416_SETUP_SDHCI

	select S3C2416_PM if PM

	help

	  Say Y here if you are using an SMDK2416

obj-$(CONFIG_S3C2416_PM)	+= pm.o

#obj-$(CONFIG_S3C2416_DMA)	+= dma.o

# Device setup

obj-$(CONFIG_S3C2416_SETUP_SDHCI) += setup-sdhci.o

obj-$(CONFIG_S3C2416_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o

# Machine support

obj-$(CONFIG_MACH_SMDK2416)	+= mach-smdk2416.o