diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 23:17:52 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 23:17:52 +0100 |
| commit | 0b019a41553a919965bb02d07d54e3e6c57a796d (patch) | |
| tree | 6e329b4159b440d2aac5200a5c07103fe261c096 /arch/arm/mach-s3c64xx/s3c6410.c | |
| parent | 5f6878b0d22f9b93f9698f88c335007e2a3c3bbc (diff) | |
| parent | 054d5c9238f3c577ad51195c3ee7803613f322cc (diff) | |
| download | blackbird-obmc-linux-0b019a41553a919965bb02d07d54e3e6c57a796d.tar.gz blackbird-obmc-linux-0b019a41553a919965bb02d07d54e3e6c57a796d.zip | |
Merge branches 'master' and 'devel' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/mach-s3c64xx/s3c6410.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/s3c6410.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c64xx/s3c6410.c b/arch/arm/mach-s3c64xx/s3c6410.c index 014401c39f36..312aa6b115e8 100644 --- a/arch/arm/mach-s3c64xx/s3c6410.c +++ b/arch/arm/mach-s3c64xx/s3c6410.c @@ -37,8 +37,9 @@ #include <plat/devs.h> #include <plat/clock.h> #include <plat/sdhci.h> +#include <plat/ata-core.h> +#include <plat/adc-core.h> #include <plat/iic-core.h> -#include <plat/adc.h> #include <plat/onenand-core.h> #include <mach/s3c6400.h> #include <mach/s3c6410.h> @@ -54,10 +55,11 @@ void __init s3c6410_map_io(void) s3c_i2c0_setname("s3c2440-i2c"); s3c_i2c1_setname("s3c2440-i2c"); - s3c_device_adc.name = "s3c64xx-adc"; + s3c_adc_setname("s3c64xx-adc"); s3c_device_nand.name = "s3c6400-nand"; s3c_onenand_setname("s3c6410-onenand"); s3c64xx_onenand1_setname("s3c6410-onenand"); + s3c_cfcon_setname("s3c64xx-pata"); } void __init s3c6410_init_clocks(int xtal) |
