diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 18:05:33 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 18:05:33 +0900 |
| commit | 1770a8988f6178efdc1bfc85fb29deacac49fe91 (patch) | |
| tree | b20b8da8b92e388847a55e7c7da9d919fe3f3abb /arch/arm/mach-s5p6440/mach-smdk6440.c | |
| parent | 1e8ff636beb6ee5c87868a6081cc4f95b1ccd713 (diff) | |
| parent | 734552072335b00476b626b027ca4a9f57147b6f (diff) | |
| download | blackbird-op-linux-1770a8988f6178efdc1bfc85fb29deacac49fe91.tar.gz blackbird-op-linux-1770a8988f6178efdc1bfc85fb29deacac49fe91.zip | |
ARM: Merge for-2635/s5p-audio
Merge branch 'for-2635/s5p-audio' into for-linus/samsung2
Diffstat (limited to 'arch/arm/mach-s5p6440/mach-smdk6440.c')
| -rw-r--r-- | arch/arm/mach-s5p6440/mach-smdk6440.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s5p6440/mach-smdk6440.c b/arch/arm/mach-s5p6440/mach-smdk6440.c index 3ae88f2c7c77..d7fede971ca6 100644 --- a/arch/arm/mach-s5p6440/mach-smdk6440.c +++ b/arch/arm/mach-s5p6440/mach-smdk6440.c @@ -84,6 +84,7 @@ static struct s3c2410_uartcfg smdk6440_uartcfgs[] __initdata = { }; static struct platform_device *smdk6440_devices[] __initdata = { + &s5p6440_device_iis, }; static void __init smdk6440_map_io(void) |
