aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c2412/mach-jive.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-08-26 23:16:39 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-08-26 23:16:45 +0100
commit9abc6461a3802702ada88cbac1fed045dbd9b466 (patch)
tree5d377876a0fb5249902912fd4d1b71a10ba9907b /arch/arm/mach-s3c2412/mach-jive.c
parentf8787fdcf6f46d6a65a42dbddb70cd7e4dc5b741 (diff)
parent78af47353065ea776d537f6e8b32c7c15b6ea169 (diff)
Merge branch 's3c2410' of git://aeryn.fluff.org.uk/bjdooks/linux.git
Diffstat (limited to 'arch/arm/mach-s3c2412/mach-jive.c')
-rw-r--r--arch/arm/mach-s3c2412/mach-jive.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c
index 4c061d29463..ad980a1690c 100644
--- a/arch/arm/mach-s3c2412/mach-jive.c
+++ b/arch/arm/mach-s3c2412/mach-jive.c
@@ -395,7 +395,7 @@ static void jive_lcd_spi_chipselect(struct s3c2410_spigpio_info *spi, int cs)
}
static struct s3c2410_spigpio_info jive_lcd_spi = {
- .bus_num = 0,
+ .bus_num = 1,
.pin_clk = S3C2410_GPG8,
.pin_mosi = S3C2410_GPB8,
.chip_select = jive_lcd_spi_chipselect,