diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:05:33 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:05:33 -0400 |
| commit | 1770a8988f6178efdc1bfc85fb29deacac49fe91 (patch) | |
| tree | b20b8da8b92e388847a55e7c7da9d919fe3f3abb /arch/arm/mach-s5pv210/mach-smdkc110.c | |
| parent | 1e8ff636beb6ee5c87868a6081cc4f95b1ccd713 (diff) | |
| parent | 734552072335b00476b626b027ca4a9f57147b6f (diff) | |
ARM: Merge for-2635/s5p-audio
Merge branch 'for-2635/s5p-audio' into for-linus/samsung2
Diffstat (limited to 'arch/arm/mach-s5pv210/mach-smdkc110.c')
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-smdkc110.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c b/arch/arm/mach-s5pv210/mach-smdkc110.c index ab4869df30c0..6f9fd3274e2e 100644 --- a/arch/arm/mach-s5pv210/mach-smdkc110.c +++ b/arch/arm/mach-s5pv210/mach-smdkc110.c | |||
| @@ -72,6 +72,8 @@ static struct s3c2410_uartcfg smdkv210_uartcfgs[] __initdata = { | |||
| 72 | }; | 72 | }; |
| 73 | 73 | ||
| 74 | static struct platform_device *smdkc110_devices[] __initdata = { | 74 | static struct platform_device *smdkc110_devices[] __initdata = { |
| 75 | &s5pv210_device_iis0, | ||
| 76 | &s5pv210_device_ac97, | ||
| 75 | }; | 77 | }; |
| 76 | 78 | ||
| 77 | static void __init smdkc110_map_io(void) | 79 | static void __init smdkc110_map_io(void) |