diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 07:35:57 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 07:35:57 -0500 |
| commit | 2ca1a615835d9f4990f42102ab1f2ef434e7e89c (patch) | |
| tree | 726cf3d5f29a6c66c44e4bd68e7ebed2fd83d059 /drivers/spi/spi_s3c24xx.c | |
| parent | e12f0102ac81d660c9f801d0a0e10ccf4537a9de (diff) | |
| parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/x86/kernel/io_apic.c
Diffstat (limited to 'drivers/spi/spi_s3c24xx.c')
| -rw-r--r-- | drivers/spi/spi_s3c24xx.c | 2 |
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 | ||
| 34 | struct s3c24xx_spi { | 34 | struct s3c24xx_spi { |