X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=arch%2Farm%2Fmach-s3c2410%2Fmach-bast.c;h=27f63d5d3a7b84e391aab59e26a82931bc2e4868;hb=f08252623c7981f5cea70e4fab4983a94fc52212;hp=b45fb65889d249706c590d4861681af1fac5f2fe;hpb=6ddc4b07a2669bdb8b90e3e12fb1ccfb6dc4a99c;p=safe%2Fjmp%2Flinux-2.6

diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index b45fb65..27f63d5 100644
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -259,7 +259,7 @@ static int bast_pm_resume(struct sys_device *sd)
 #endif
 
 static struct sysdev_class bast_pm_sysclass = {
-	set_kset_name("mach-bast"),
+	.name		= "mach-bast",
 	.suspend	= bast_pm_suspend,
 	.resume		= bast_pm_resume,
 };
@@ -374,7 +374,7 @@ static struct resource bast_dm9k_resource[] = {
 	[2] = {
 		.start = IRQ_DM9000,
 		.end   = IRQ_DM9000,
-		.flags = IORESOURCE_IRQ,
+		.flags = IORESOURCE_IRQ | IRQF_TRIGGER_HIGH,
 	}
 
 };
@@ -592,10 +592,10 @@ static void __init bast_map_io(void)
 {
 	/* initialise the clocks */
 
-	s3c24xx_dclk0.parent = NULL;
+	s3c24xx_dclk0.parent = &clk_upll;
 	s3c24xx_dclk0.rate   = 12*1000*1000;
 
-	s3c24xx_dclk1.parent = NULL;
+	s3c24xx_dclk1.parent = &clk_upll;
 	s3c24xx_dclk1.rate   = 24*1000*1000;
 
 	s3c24xx_clkout0.parent  = &s3c24xx_dclk0;