diff -urN linux-2.6.22/arch/arm/mach-s3c2410/clock.c linux-2.6.22-hammer/arch/arm/mach-s3c2410/clock.c
--- linux-2.6.22/arch/arm/mach-s3c2410/clock.c	2007-07-08 18:32:17.000000000 -0500
+++ linux-2.6.22-hammer/arch/arm/mach-s3c2410/clock.c	2007-09-12 12:58:51.000000000 -0500
@@ -118,13 +118,7 @@
 		.parent		= &clk_p,
 		.enable		= s3c2410_clkcon_enable,
 		.ctrlbit	= S3C2410_CLKCON_IIS,
-	}, {
-		.name		= "spi",
-		.id		= -1,
-		.parent		= &clk_p,
-		.enable		= s3c2410_clkcon_enable,
-		.ctrlbit	= S3C2410_CLKCON_SPI,
-	}
+	},
 };
 
 static struct clk init_clocks[] = {
@@ -195,7 +189,13 @@
 		.name		= "usb-bus-gadget",
 		.id		= -1,
 		.parent		= &clk_usb_bus,
-	},
+	}, {
+		.name		= "spi",
+		.id		= -1,
+		.parent		= &clk_p,
+		.enable		= s3c2410_clkcon_enable,
+		.ctrlbit	= S3C2410_CLKCON_SPI,
+	}
 };
 
 /* s3c2410_baseclk_add()