Merge branch 'irq-cleanups-upstream' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6] / arch / arm / mach-s3c2410 / mach-vr1000.c

diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c
index 9f43f3f124f561eeec3efa9b5bbc16a9c083b5e1..c56423373ff311af067e8ad5d37cb7152bf1fdcd 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-vr1000.c
+++ b/arch/arm/mach-s3c2410/mach-vr1000.c
@@ -365,7 +365,6 @@ static struct platform_device *vr1000_devices[] __initdata = {
        &s3c_device_lcd,
        &s3c_device_wdt,
        &s3c_device_i2c,
-       &s3c_device_iis,
        &s3c_device_adc,
        &serial_device,
        &vr1000_nor,
@@ -394,7 +393,7 @@ static void __init vr1000_map_io(void)
 {
        /* initialise clock sources */
 
-       s3c24xx_dclk0.parent = NULL;
+       s3c24xx_dclk0.parent = &clk_upll;
        s3c24xx_dclk0.rate   = 12*1000*1000;
 
        s3c24xx_dclk1.parent = NULL;