aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-11-29 14:35:07 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-11-29 14:35:07 -0500
commitfba670013d538719d13f103b2a5b4b06bdca202b (patch)
treef7b97d71161a17619e0ba92ffbef5ec2e7823776 /drivers/spi
parent7577fdfa52438a19e7e8abedb6efc645986af2ae (diff)
parente856359685143a2f65876e7db4e4aa0ef5dce7f0 (diff)
Merge branch 's3c-moves2' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi_s3c24xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c
index c252cbac00f1..256d18395a23 100644
--- a/drivers/spi/spi_s3c24xx.c
+++ b/drivers/spi/spi_s3c24xx.c
@@ -28,7 +28,7 @@
28#include <mach/hardware.h> 28#include <mach/hardware.h>
29 29
30#include <mach/regs-gpio.h> 30#include <mach/regs-gpio.h>
31#include <asm/plat-s3c24xx/regs-spi.h> 31#include <plat/regs-spi.h>
32#include <mach/spi.h> 32#include <mach/spi.h>
33 33
34struct s3c24xx_spi { 34struct s3c24xx_spi {