diff -urpN -X ../dontdiff linux-2.6.20-rc5-spifix1/drivers/spi/spi_s3c24xx.c linux-2.6.20-rc5-spifix2/drivers/spi/spi_s3c24xx.c
--- linux-2.6.20-rc5-spifix1/drivers/spi/spi_s3c24xx.c	2007-01-23 10:26:52.000000000 +0000
+++ linux-2.6.20-rc5-spifix2/drivers/spi/spi_s3c24xx.c	2007-01-23 10:55:00.000000000 +0000
@@ -243,6 +243,16 @@ static int s3c24xx_spi_probe(struct plat
 		goto err_nomem;
 	}
 
+	if (pdev->id == 0) {
+		s3c2410_gpio_cfgpin(S3C2410_GPE13, S3C2410_GPE13_SPICLK0);
+		s3c2410_gpio_cfgpin(S3C2410_GPE12, S3C2410_GPE12_SPIMOSI0);
+		s3c2410_gpio_cfgpin(S3C2410_GPE11, S3C2410_GPE11_SPIMISO0);
+	} else {
+		s3c2410_gpio_cfgpin(S3C2410_GPG7, S3C2410_GPG7_SPICLK1);
+		s3c2410_gpio_cfgpin(S3C2410_GPG6, S3C2410_GPG6_SPIMOSI1);
+		s3c2410_gpio_cfgpin(S3C2410_GPG5, S3C2410_GPG5_SPIMISO1);
+	}
+
 	hw = spi_master_get_devdata(master);
 	memset(hw, 0, sizeof(struct s3c24xx_spi));