diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-17 12:04:46 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-17 12:04:46 +0100 |
| commit | 69887ac1dcb79dfc773dabac2dd081fa6d6e2573 (patch) | |
| tree | 23a4f685c71ff8666548b0a01b221928e46a9287 /arch/arm/mach-s3c2410/s3c2440.c | |
| parent | 5e014b10ef8477c32a939a48fa02aedcad35a226 (diff) | |
| parent | 118326e940bdecef6c459d42ccf05256ba86daa7 (diff) | |
| download | talos-obmc-linux-69887ac1dcb79dfc773dabac2dd081fa6d6e2573.tar.gz talos-obmc-linux-69887ac1dcb79dfc773dabac2dd081fa6d6e2573.zip | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/arm/mach-s3c2410/s3c2440.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/s3c2440.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/s3c2440.c b/arch/arm/mach-s3c2410/s3c2440.c index 9a8cc5ae2255..d4c8281b55f6 100644 --- a/arch/arm/mach-s3c2410/s3c2440.c +++ b/arch/arm/mach-s3c2410/s3c2440.c @@ -192,9 +192,11 @@ void __init s3c2440_map_io(struct map_desc *mach_desc, int size) iotable_init(s3c2440_iodesc, ARRAY_SIZE(s3c2440_iodesc)); iotable_init(mach_desc, size); + /* rename any peripherals used differing from the s3c2410 */ - s3c_device_i2c.name = "s3c2440-i2c"; + s3c_device_i2c.name = "s3c2440-i2c"; + s3c_device_nand.name = "s3c2440-nand"; /* change irq for watchdog */ @@ -225,7 +227,7 @@ void __init s3c2440_init_clocks(int xtal) break; case S3C2440_CLKDIVN_HDIVN_2: - hdiv = 1; + hdiv = 2; break; case S3C2440_CLKDIVN_HDIVN_4_8: |
