diff options
| author | Ingo Molnar <[email protected]> | 2008-08-11 12:57:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2008-08-11 12:57:01 +0200 |
| commit | 6de9c70882ecdee63a652d493bf2353963bd4c22 (patch) | |
| tree | 9d219e705492331c97f5f7dccce3b0b1a29251bf /drivers/spi/spi_s3c24xx_gpio.c | |
| parent | d406d21d90dce2e66c7eb4a44605aac947fe55fb (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'drivers/spi/spi_s3c24xx_gpio.c')
| -rw-r--r-- | drivers/spi/spi_s3c24xx_gpio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c index e33f6145c560..cc1f647f579b 100644 --- a/drivers/spi/spi_s3c24xx_gpio.c +++ b/drivers/spi/spi_s3c24xx_gpio.c @@ -21,9 +21,9 @@ #include <linux/spi/spi.h> #include <linux/spi/spi_bitbang.h> -#include <asm/arch/regs-gpio.h> -#include <asm/arch/spi-gpio.h> -#include <asm/hardware.h> +#include <mach/regs-gpio.h> +#include <mach/spi-gpio.h> +#include <mach/hardware.h> struct s3c2410_spigpio { struct spi_bitbang bitbang; |