diff options
| author |   Kukjin Kim <kgene.kim@samsung.com> | 2010-12-31 10:52:05 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-31 10:52:05 +0900 |
| commit | 285dee7ff4fb4b32838694d4378f4aa938cf5b43 (patch) | |
| tree | fa15cd1b385898f01ead4649712f6e4fbcd055cd /arch/arm/mach-s5pv310/mach-smdkc210.c | |
| parent | Merge branch 'next-s5pv210' into for-next-new (diff) | |
| parent | Merge branch 'dev/s5pv310-irq' into next-s5pv310 (diff) | |
| download | linux-dev-285dee7ff4fb4b32838694d4378f4aa938cf5b43.tar.xz linux-dev-285dee7ff4fb4b32838694d4378f4aa938cf5b43.zip | |
Merge branch 'next-s5pv310' into for-next
Conflicts:
arch/arm/mach-s5pv310/Kconfig
arch/arm/mach-s5pv310/Makefile
arch/arm/mach-s5pv310/mach-smdkc210.c
arch/arm/mach-s5pv310/mach-smdkv310.c
arch/arm/plat-samsung/include/plat/devs.h
Diffstat (limited to 'arch/arm/mach-s5pv310/mach-smdkc210.c')
| -rw-r--r-- | arch/arm/mach-s5pv310/mach-smdkc210.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pv310/mach-smdkc210.c b/arch/arm/mach-s5pv310/mach-smdkc210.c index f3bc283df119..9262966cd269 100644 --- a/arch/arm/mach-s5pv310/mach-smdkc210.c +++ b/arch/arm/mach-s5pv310/mach-smdkc210.c @@ -26,6 +26,7 @@ #include <plat/devs.h> #include <plat/sdhci.h> #include <plat/iic.h> +#include <plat/pd.h> #include <mach/map.h> @@ -146,16 +147,23 @@ static struct i2c_board_info i2c_devs1[] __initdata = { }; static struct platform_device *smdkc210_devices[] __initdata = { - &s3c_device_i2c1, &s3c_device_hsmmc0, &s3c_device_hsmmc1, &s3c_device_hsmmc2, &s3c_device_hsmmc3, + &s3c_device_i2c1, &s3c_device_rtc, &s3c_device_wdt, - &smdkc210_smsc911x, &s5pv310_device_ac97, &s5pv310_device_i2s0, + &s5pv310_device_pd[PD_MFC], + &s5pv310_device_pd[PD_G3D], + &s5pv310_device_pd[PD_LCD0], + &s5pv310_device_pd[PD_LCD1], + &s5pv310_device_pd[PD_CAM], + &s5pv310_device_pd[PD_TV], + &s5pv310_device_pd[PD_GPS], + &smdkc210_smsc911x, }; static void __init smdkc210_smsc911x_init(void) |