Clean up 'print_fn_descriptor_symbol()' types

[linux-2.6] / arch / arm / mach-s3c2443 / s3c2443.c

diff --git a/arch/arm/mach-s3c2443/s3c2443.c b/arch/arm/mach-s3c2443/s3c2443.c
index bc14f772ff245e063d8e25e42e7e054dc1c00a55..9ce490560af98df561a7742a858515c17cc063fd 100644 (file)
--- a/arch/arm/mach-s3c2443/s3c2443.c
+++ b/arch/arm/mach-s3c2443/s3c2443.c
@@ -29,7 +29,8 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#include <asm/arch/regs-serial.h>
+#include <asm/arch/regs-s3c2443-clock.h>
+#include <asm/arch/reset.h>
 
 #include <asm/plat-s3c24xx/s3c2443.h>
 #include <asm/plat-s3c24xx/devs.h>
@@ -42,17 +43,30 @@ static struct map_desc s3c2443_iodesc[] __initdata = {
 };
 
 struct sysdev_class s3c2443_sysclass = {
-       set_kset_name("s3c2443-core"),
+       .name = "s3c2443-core",
 };
 
 static struct sys_device s3c2443_sysdev = {
        .cls            = &s3c2443_sysclass,
 };
 
+static void s3c2443_hard_reset(void)
+{
+       __raw_writel(S3C2443_SWRST_RESET, S3C2443_SWRST);
+}
+
 int __init s3c2443_init(void)
 {
        printk("S3C2443: Initialising architecture\n");
 
+       s3c24xx_reset_hook = s3c2443_hard_reset;
+
+       s3c_device_nand.name = "s3c2412-nand";
+
+       /* change WDT IRQ number */
+       s3c_device_wdt.resource[1].start = IRQ_S3C2443_WDT;
+       s3c_device_wdt.resource[1].end   = IRQ_S3C2443_WDT;
+
        return sysdev_register(&s3c2443_sysdev);
 }