diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 20:25:59 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 20:25:59 +0900 |
| commit | 206a1a825dc67060ee319c99569755ba11250907 (patch) | |
| tree | e4cdbd7b8b745e0ad4adfd59fa57c3bcabe3daf4 /arch/arm/mach-s5pc100/cpu.c | |
| parent | 6aeaad51aaecc9ebc8c1e8f132655e2ae8141f8c (diff) | |
| parent | 999304be1177d42d16bc59c546228c6ac5a3e76a (diff) | |
| download | lwn-206a1a825dc67060ee319c99569755ba11250907.tar.gz lwn-206a1a825dc67060ee319c99569755ba11250907.zip | |
ARM: Merge for-2635-4/onenand
Merge branch 'for-2635-4/onenand' into for-2635-4/partial2
Conflicts:
arch/arm/mach-s5pc100/cpu.c
arch/arm/mach-s5pc100/include/mach/map.h
arch/arm/mach-s5pv210/Makefile
Diffstat (limited to 'arch/arm/mach-s5pc100/cpu.c')
| -rw-r--r-- | arch/arm/mach-s5pc100/cpu.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pc100/cpu.c b/arch/arm/mach-s5pc100/cpu.c index d424a9fda034..816c4d4afef0 100644 --- a/arch/arm/mach-s5pc100/cpu.c +++ b/arch/arm/mach-s5pc100/cpu.c @@ -40,6 +40,8 @@ #include <plat/clock.h> #include <plat/iic-core.h> #include <plat/sdhci.h> +#include <plat/onenand-core.h> + #include <plat/s5pc100.h> /* Initial IO mappings */ @@ -88,6 +90,8 @@ void __init s5pc100_map_io(void) /* the i2c devices are directly compatible with s3c2440 */ s3c_i2c0_setname("s3c2440-i2c"); s3c_i2c1_setname("s3c2440-i2c"); + + s3c_onenand_setname("s5pc100-onenand"); } void __init s5pc100_init_clocks(int xtal) |