diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpio/gpiolib.c | 3 | ||||
-rw-r--r-- | drivers/input/keyboard/gpio_keys.c | 2 | ||||
-rw-r--r-- | drivers/input/keyboard/neo1973kbd.c | 2 | ||||
-rw-r--r-- | drivers/input/keyboard/qt2410kbd.c | 2 | ||||
-rw-r--r-- | drivers/input/touchscreen/s3c2410_ts.c | 2 | ||||
-rw-r--r-- | drivers/leds/leds-neo1973-gta02.c | 2 | ||||
-rw-r--r-- | drivers/leds/leds-neo1973-vibrator.c | 2 | ||||
-rw-r--r-- | drivers/mfd/glamo/glamo-core.c | 2 | ||||
-rw-r--r-- | drivers/mfd/glamo/glamo-core.h | 1 | ||||
-rw-r--r-- | drivers/mfd/glamo/glamo-lcm-spi.c | 2 | ||||
-rw-r--r-- | drivers/mfd/glamo/glamo-spi-gpio.c | 2 | ||||
-rw-r--r-- | drivers/power/gta02_hdq.c | 2 | ||||
-rw-r--r-- | drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c | 2 | ||||
-rw-r--r-- | drivers/spi/spi_s3c24xx_gpio.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ohci-s3c2410.c | 6 | ||||
-rw-r--r-- | drivers/video/backlight/gta01_bl.c | 2 |
16 files changed, 18 insertions, 18 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index faa1cc66e9c..753a50c1ece 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -6,8 +6,7 @@ #include <linux/err.h> #include <linux/debugfs.h> #include <linux/seq_file.h> -#include <linux/gpio.h> - +#include <asm/arch/gpio.h> /* Optional implementation infrastructure for GPIO interfaces. * diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index 05f3f43582c..b78d6d876e6 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c @@ -23,7 +23,7 @@ #include <linux/input.h> #include <linux/gpio_keys.h> -#include <asm/gpio.h> +#include <asm/arch/gpio.h> struct gpio_button_data { struct gpio_keys_button *button; diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c index 70d8bc051df..62ee53a1e1b 100644 --- a/drivers/input/keyboard/neo1973kbd.c +++ b/drivers/input/keyboard/neo1973kbd.c @@ -23,7 +23,7 @@ #include <linux/slab.h> #include <linux/workqueue.h> -#include <asm/gpio.h> +#include <asm/arch/gpio.h> #include <asm/mach-types.h> struct neo1973kbd { diff --git a/drivers/input/keyboard/qt2410kbd.c b/drivers/input/keyboard/qt2410kbd.c index 95392cc9029..b14135cd21e 100644 --- a/drivers/input/keyboard/qt2410kbd.c +++ b/drivers/input/keyboard/qt2410kbd.c @@ -20,7 +20,7 @@ #include <linux/module.h> #include <linux/slab.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/arch/gta01.h> struct gta01kbd { diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c index 5bc347f3a8f..0933a33bc9a 100644 --- a/drivers/input/touchscreen/s3c2410_ts.c +++ b/drivers/input/touchscreen/s3c2410_ts.c @@ -54,7 +54,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/arch/regs-gpio.h> +#include <mach/regs-gpio.h> #include <asm/arch/ts.h> #include <asm/plat-s3c/regs-adc.h> diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c index 8fe817b7fd4..4b8687d0427 100644 --- a/drivers/leds/leds-neo1973-gta02.c +++ b/drivers/leds/leds-neo1973-gta02.c @@ -15,7 +15,7 @@ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/leds.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/arch/pwm.h> #include <asm/arch/gta02.h> diff --git a/drivers/leds/leds-neo1973-vibrator.c b/drivers/leds/leds-neo1973-vibrator.c index 647e8603430..2b50504af6c 100644 --- a/drivers/leds/leds-neo1973-vibrator.c +++ b/drivers/leds/leds-neo1973-vibrator.c @@ -17,7 +17,7 @@ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/leds.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/arch/pwm.h> #include <asm/arch/gta01.h> diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c index c2a0d254560..7123080e050 100644 --- a/drivers/mfd/glamo/glamo-core.c +++ b/drivers/mfd/glamo/glamo-core.c @@ -45,6 +45,8 @@ #include <asm/uaccess.h> #include <asm/div64.h> +//#include <mach/regs-irq.h> + #ifdef CONFIG_PM #include <linux/pm.h> #endif diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h index dd6f67c3386..57214de9e00 100644 --- a/drivers/mfd/glamo/glamo-core.h +++ b/drivers/mfd/glamo/glamo-core.h @@ -17,7 +17,6 @@ #define GLAMO_MMC_BUFFER_SIZE (64 * 1024) #define GLAMO_FB_SIZE (GLAMO_INTERNAL_RAM_SIZE - GLAMO_MMC_BUFFER_SIZE) - struct glamo_core { int irq; int irq_works; /* 0 means PCB does not support Glamo IRQ */ diff --git a/drivers/mfd/glamo/glamo-lcm-spi.c b/drivers/mfd/glamo/glamo-lcm-spi.c index 874fb0e8c13..c8ff8a77e95 100644 --- a/drivers/mfd/glamo/glamo-lcm-spi.c +++ b/drivers/mfd/glamo/glamo-lcm-spi.c @@ -30,7 +30,7 @@ #include <linux/glamofb.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include "glamo-core.h" #include "glamo-regs.h" diff --git a/drivers/mfd/glamo/glamo-spi-gpio.c b/drivers/mfd/glamo/glamo-spi-gpio.c index ece575022c9..2bf4e38ca8e 100644 --- a/drivers/mfd/glamo/glamo-spi-gpio.c +++ b/drivers/mfd/glamo/glamo-spi-gpio.c @@ -30,7 +30,7 @@ #include <linux/glamofb.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include "glamo-core.h" #include "glamo-regs.h" diff --git a/drivers/power/gta02_hdq.c b/drivers/power/gta02_hdq.c index 5a79fd6ac95..159daa99c3c 100644 --- a/drivers/power/gta02_hdq.c +++ b/drivers/power/gta02_hdq.c @@ -15,7 +15,7 @@ #include <linux/init.h> #include <linux/delay.h> #include <linux/platform_device.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/arch/gta02.h> #include <asm/arch/fiq_ipc_gta02.h> diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c index 09d81ee2087..4f261556a2e 100644 --- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c +++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c @@ -47,7 +47,7 @@ #include <asm/dma-mapping.h> #include <asm/arch/regs-sdi.h> -#include <asm/arch/regs-gpio.h> +#include <mach/regs-gpio.h> #include <asm/arch/mci.h> #include <asm/arch/gta02.h> diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c index b41de422cb4..69637036056 100644 --- a/drivers/spi/spi_s3c24xx_gpio.c +++ b/drivers/spi/spi_s3c24xx_gpio.c @@ -22,7 +22,7 @@ #include <linux/spi/spi_bitbang.h> #include <mach/regs-gpio.h> -#include <mach/spi-gpio.h> +#include <asm/arch/spi-gpio.h> #include <mach/hardware.h> struct s3c2410_spigpio { diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c index afe88940b55..717b6951fda 100644 --- a/drivers/usb/host/ohci-s3c2410.c +++ b/drivers/usb/host/ohci-s3c2410.c @@ -22,9 +22,9 @@ #include <linux/platform_device.h> #include <linux/clk.h> -#include <asm/hardware.h> -#include <asm/arch/usb-control.h> -#include <asm/arch/regs-gpio.h> +#include <mach/hardware.h> +#include <mach/usb-control.h> +#include <mach/regs-gpio.h> #define valid_port(idx) ((idx) == 1 || (idx) == 2) diff --git a/drivers/video/backlight/gta01_bl.c b/drivers/video/backlight/gta01_bl.c index a7170dffc7b..cc2caee549d 100644 --- a/drivers/video/backlight/gta01_bl.c +++ b/drivers/video/backlight/gta01_bl.c @@ -35,7 +35,7 @@ #include <linux/backlight.h> #include <linux/clk.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/arch/gta01.h> #include <asm/arch/pwm.h> |