ARM: s3c: make headers local if possible

A lot of header files are only used internally now, so they can be moved
to mach-s3c, out of the visibility of drivers.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20200806182059.2431-40-krzk@kernel.org
[krzk: Rebase and fixup leds-s3c24xx driver]
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

arch/arm/mach-s3c/adc.c

@@ -19,7 +19,7 @@
 #include <linux/io.h>
 #include <linux/regulator/consumer.h>
 
-#include <plat/regs-adc.h>
+#include "regs-adc.h"
 #include <linux/soc/samsung/s3c-adc.h>
 
 /* This driver is designed to control the usage of the ADC block between

arch/arm/mach-s3c/bast-ide.c

@@ -19,7 +19,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/map.h>
+#include "map.h"
 #include <mach/irqs.h>
 
 #include "bast.h"

arch/arm/mach-s3c/bast-irq.c

@@ -15,7 +15,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/irq.h>
 
-#include <mach/regs-irq.h>
+#include "regs-irq.h"
 #include <mach/irqs.h>
 
 #include "bast.h"

arch/arm/mach-s3c/common-smdk-s3c24xx.c

@@ -31,14 +31,14 @@
 #include <asm/mach-types.h>
 #include <asm/irq.h>
 
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 #include <linux/platform_data/leds-s3c24xx.h>
 #include <linux/platform_data/mtd-nand-s3c2410.h>
 
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/pm.h>
+#include "pm.h"
 
 #include "common-smdk-s3c24xx.h"
 

arch/arm/mach-s3c/cpu.c

@@ -10,8 +10,8 @@
 #include <linux/init.h>
 #include <linux/io.h>
 
-#include <plat/map-base.h>
+#include <mach/map-base.h>
-#include <plat/cpu.h>
+#include "cpu.h"
 
 unsigned long samsung_cpu_id;
 

arch/arm/mach-s3c/cpufreq-utils-s3c24xx.c

@@ -12,8 +12,8 @@
 #include <linux/io.h>
 #include <linux/clk.h>
 
-#include <mach/map.h>
+#include "map.h"
-#include <mach/regs-clock.h>
+#include "regs-clock.h"
 
 #include <linux/soc/samsung/s3c-cpufreq-core.h>
 

arch/arm/mach-s3c/cpuidle-s3c64xx.c

@@ -13,8 +13,8 @@
 
 #include <asm/cpuidle.h>
 
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <mach/map.h>
+#include "map.h"
 
 #include "regs-sys-s3c64xx.h"
 #include "regs-syscon-power-s3c64xx.h"

arch/arm/mach-s3c/crag6410.h

@@ -8,7 +8,7 @@
 #ifndef MACH_CRAG6410_H
 #define MACH_CRAG6410_H
 
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
 #define GLENFARCLAS_PMIC_IRQ_BASE	IRQ_BOARD_START
 #define BANFF_PMIC_IRQ_BASE		(IRQ_BOARD_START + 64)

arch/arm/mach-s3c/dev-audio-s3c64xx.c

@@ -11,12 +11,12 @@
 #include <linux/export.h>
 
 #include <mach/irqs.h>
-#include <mach/map.h>
+#include "map.h"
 
-#include <plat/devs.h>
+#include "devs.h"
 #include <linux/platform_data/asoc-s3c.h>
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
 static int s3c64xx_i2s_cfg_gpio(struct platform_device *pdev)
 {

arch/arm/mach-s3c/dev-backlight-s3c64xx.c

@@ -11,8 +11,8 @@
 #include <linux/io.h>
 #include <linux/pwm_backlight.h>
 
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
 
 #include "backlight-s3c64xx.h"
 

arch/arm/mach-s3c/dev-uart-s3c64xx.c

@@ -15,10 +15,10 @@
 
 #include <asm/mach/arch.h>
 #include <asm/mach/irq.h>
-#include <mach/map.h>
+#include "map.h"
 #include <mach/irqs.h>
 
-#include <plat/devs.h>
+#include "devs.h"
 
 /* Serial port registrations */
 

arch/arm/mach-s3c/dev-uart.c

@@ -10,7 +10,7 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 
-#include <plat/devs.h>
+#include "devs.h"
 
 /* uart devices */
 

arch/arm/mach-s3c/devs.c

@@ -39,31 +39,31 @@
 #include <asm/mach/irq.h>
 
 #include <mach/irqs.h>
-#include <mach/map.h>
+#include "map.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
+#include "gpio-cfg.h"
 
 #ifdef CONFIG_PLAT_S3C24XX
-#include <mach/regs-s3c2443-clock.h>
+#include "regs-s3c2443-clock.h"
 #endif /* CONFIG_PLAT_S3C24XX */
 
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/gpio-cfg.h>
 #include <linux/soc/samsung/s3c-adc.h>
 #include <linux/platform_data/ata-samsung_cf.h>
-#include <plat/fb.h>
+#include "fb.h"
 #include <linux/platform_data/fb-s3c2410.h>
 #include <linux/platform_data/hwmon-s3c.h>
 #include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/keypad.h>
+#include "keypad.h"
 #include <linux/platform_data/mmc-s3cmci.h>
 #include <linux/platform_data/mtd-nand-s3c2410.h>
-#include <plat/pwm-core.h>
+#include "pwm-core.h"
-#include <plat/sdhci.h>
+#include "sdhci.h"
 #include <linux/platform_data/touchscreen-s3c2410.h>
 #include <linux/platform_data/usb-s3c2410_udc.h>
 #include <linux/platform_data/usb-ohci-s3c2410.h>
-#include <plat/usb-phy.h>
+#include "usb-phy.h"
 #include <linux/platform_data/asoc-s3c.h>
 #include <linux/platform_data/spi-s3c64xx.h>
 

arch/arm/mach-s3c/gpio-core.h

@@ -11,7 +11,7 @@
 #define __PLAT_SAMSUNG_GPIO_CORE_H
 
 /* Bring in machine-local definitions, especially S3C_GPIO_END */
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 #include <linux/gpio/driver.h>
 
 #define GPIOCON_OFF	(0x00)

arch/arm/mach-s3c/gpio-samsung-s3c24xx.h

@@ -14,7 +14,7 @@
 #ifndef GPIO_SAMSUNG_S3C24XX_H
 #define GPIO_SAMSUNG_S3C24XX_H
 
-#include <mach/map.h>
+#include "map.h"
 
 /*
  * GPIO sizes for various SoCs:

arch/arm/mach-s3c/gpio-samsung.c

@@ -27,15 +27,15 @@
 #include <asm/irq.h>
 
 #include <mach/irqs.h>
-#include <mach/map.h>
+#include "map.h"
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/gpio-core.h>
+#include "gpio-core.h"
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
-#include <plat/gpio-cfg-helpers.h>
+#include "gpio-cfg-helpers.h"
-#include <plat/pm.h>
+#include "pm.h"
 
 int samsung_gpio_setpull_updown(struct samsung_gpio_chip *chip,
 				unsigned int off, samsung_gpio_pull_t pull)

arch/arm/mach-s3c/gta02.h

@@ -6,7 +6,7 @@
 #ifndef __MACH_S3C24XX_GTA02_H
 #define __MACH_S3C24XX_GTA02_H __FILE__
 
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
 
 #define GTA02_GPIO_AUX_LED	S3C2410_GPB(2)
 #define GTA02_GPIO_USB_PULLUP	S3C2410_GPB(9)

arch/arm/mach-s3c/h1940-bluetooth.c

@@ -13,9 +13,9 @@
 #include <linux/gpio.h>
 #include <linux/rfkill.h>
 
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
 #include "h1940.h"
 

arch/arm/mach-s3c/include/mach/io-s3c24xx.h

@@ -10,7 +10,7 @@
 #ifndef __ASM_ARM_ARCH_IO_S3C24XX_H
 #define __ASM_ARM_ARCH_IO_S3C24XX_H
 
-#include <plat/map-base.h>
+#include <mach/map-base.h>
 
 /*
  * ISA style IO, for each machine to sort out mappings for,

arch/arm/mach-s3c/init.c

@@ -23,8 +23,8 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/devs.h>
+#include "devs.h"
 
 static struct cpu_table *cpu;
 

arch/arm/mach-s3c/iotiming-s3c2410.c

@@ -14,8 +14,8 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 
-#include <mach/map.h>
+#include "map.h"
-#include <mach/regs-clock.h>
+#include "regs-clock.h"
 
 #include <linux/soc/samsung/s3c-cpufreq-core.h>
 

arch/arm/mach-s3c/iotiming-s3c2412.c

@@ -23,10 +23,10 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/cpu.h>
+#include "cpu.h"
 #include <linux/soc/samsung/s3c-cpufreq-core.h>
 
-#include <mach/s3c2412.h>
+#include "s3c2412.h"
 
 #define print_ns(x) ((x) / 10), ((x) % 10)
 

arch/arm/mach-s3c/irq-pm-s3c24xx.c

@@ -13,14 +13,14 @@
 #include <linux/syscore_ops.h>
 #include <linux/io.h>
 
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/pm.h>
+#include "pm.h"
-#include <plat/map-base.h>
+#include <mach/map-base.h>
-#include <plat/map-s3c.h>
+#include "map-s3c.h"
 
-#include <mach/regs-irq.h>
+#include "regs-irq.h"
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/pm-core.h>
+#include "pm-core.h"
 
 #include <asm/irq.h>
 

arch/arm/mach-s3c/irq-pm-s3c64xx.c

@@ -20,11 +20,11 @@
 #include <linux/io.h>
 #include <linux/of.h>
 
-#include <mach/map.h>
+#include "map.h"
 
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/pm.h>
+#include "pm.h"
 
 /* We handled all the IRQ types in this code, to save having to make several
  * small files to handle each different type separately. Having the EINT_GRP

arch/arm/mach-s3c/irq-s3c24xx-fiq.S

@@ -10,8 +10,8 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 
-#include <mach/map.h>
+#include "map.h"
-#include <mach/regs-irq.h>
+#include "regs-irq.h"
 
 #include <linux/spi/s3c24xx-fiq.h>
 

arch/arm/mach-s3c/irq-s3c24xx.c

@@ -26,12 +26,12 @@
 #include <asm/mach/irq.h>
 
 #include <mach/irqs.h>
-#include <mach/regs-irq.h>
+#include "regs-irq.h"
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
 
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/regs-irqtype.h>
+#include "regs-irqtype.h"
-#include <plat/pm.h>
+#include "pm.h"
 
 #define S3C_IRQTYPE_NONE	0
 #define S3C_IRQTYPE_EINT	1

arch/arm/mach-s3c/mach-amlm5900.c

@@ -31,13 +31,13 @@
 #include <asm/mach-types.h>
 #include <linux/platform_data/fb-s3c2410.h>
 
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
 #include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>

arch/arm/mach-s3c/mach-anubis.c

@@ -27,8 +27,8 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 #include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 
@@ -39,8 +39,8 @@
 
 #include <net/ax88796.h>
 
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/cpu.h>
+#include "cpu.h"
 #include <linux/platform_data/asoc-s3c24xx_simtec.h>
 
 #include "anubis.h"

arch/arm/mach-s3c/mach-anw6410.c

@@ -30,19 +30,19 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/map.h>
+#include "map.h"
 
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
 #include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/fb.h>
+#include "fb.h"
 
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/cpu.h>
+#include "cpu.h"
 #include <mach/irqs.h>
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
 #include "s3c64xx.h"
 #include "regs-modem-s3c64xx.h"

arch/arm/mach-s3c/mach-at2440evb.c

@@ -28,8 +28,8 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 #include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 
@@ -38,8 +38,8 @@
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/cpu.h>
+#include "cpu.h"
 #include <linux/platform_data/mmc-s3cmci.h>
 
 #include "s3c24xx.h"

arch/arm/mach-s3c/mach-bast.c

@@ -41,13 +41,13 @@
 #include <asm/mach-types.h>
 
 #include <linux/platform_data/fb-s3c2410.h>
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
-#include <plat/cpu.h>
+#include "cpu.h"
 #include <linux/soc/samsung/s3c-cpu-freq.h>
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
 
 #include "bast.h"
 #include "s3c24xx.h"

arch/arm/mach-s3c/mach-crag6410-module.c

@@ -27,7 +27,7 @@
 
 #include <linux/platform_data/spi-s3c64xx.h>
 
-#include <plat/cpu.h>
+#include "cpu.h"
 #include <mach/irqs.h>
 
 #include "crag6410.h"

arch/arm/mach-s3c/mach-crag6410.c

@@ -44,22 +44,22 @@
 #include <asm/mach-types.h>
 
 #include <video/samsung_fimd.h>
-#include <mach/map.h>
+#include "map.h"
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 #include <mach/irqs.h>
 
-#include <plat/fb.h>
+#include "fb.h"
-#include <plat/sdhci.h>
+#include "sdhci.h"
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
 #include <linux/platform_data/spi-s3c64xx.h>
 
-#include <plat/keypad.h>
+#include "keypad.h"
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/cpu.h>
+#include "cpu.h"
 #include <linux/soc/samsung/s3c-adc.h>
 #include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/pm.h>
+#include "pm.h"
 
 #include "s3c64xx.h"
 #include "crag6410.h"

arch/arm/mach-s3c/mach-gta02.c

@@ -59,14 +59,14 @@
 #include <linux/platform_data/usb-s3c2410_udc.h>
 #include <linux/platform_data/fb-s3c2410.h>
 
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/regs-irq.h>
+#include "regs-irq.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
-#include <plat/pm.h>
+#include "pm.h"
 
 #include "s3c24xx.h"
 #include "gta02.h"

arch/arm/mach-s3c/mach-h1940.c

@@ -48,16 +48,16 @@
 #include <sound/uda1380.h>
 
 #include <linux/platform_data/fb-s3c2410.h>
-#include <mach/map.h>
+#include "map.h"
-#include <mach/hardware-s3c24xx.h>
+#include "hardware-s3c24xx.h"
-#include <mach/regs-clock.h>
+#include "regs-clock.h"
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
-#include <plat/pm.h>
+#include "pm.h"
 
 #include "s3c24xx.h"
 #include "h1940.h"

arch/arm/mach-s3c/mach-hmt.c

@@ -25,19 +25,19 @@
 #include <asm/mach/irq.h>
 
 #include <video/samsung_fimd.h>
-#include <mach/map.h>
+#include "map.h"
 #include <mach/irqs.h>
 
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
 #include <linux/platform_data/i2c-s3c2410.h>
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
-#include <plat/fb.h>
+#include "fb.h"
 #include <linux/platform_data/mtd-nand-s3c2410.h>
 
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/cpu.h>
+#include "cpu.h"
 
 #include "s3c64xx.h"
 

arch/arm/mach-s3c/mach-jive.c

@@ -31,10 +31,10 @@
 #include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 
-#include <mach/hardware-s3c24xx.h>
+#include "hardware-s3c24xx.h"
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
 #include <linux/platform_data/fb-s3c2410.h>
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
 #include <asm/mach-types.h>
 
@@ -43,10 +43,10 @@
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/pm.h>
+#include "pm.h"
 #include <linux/platform_data/usb-s3c2410_udc.h>
 
 #include "s3c24xx.h"

arch/arm/mach-s3c/mach-mini2440.c

@@ -33,10 +33,10 @@
 #include <linux/platform_data/fb-s3c2410.h>
 #include <asm/mach-types.h>
 
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
 #include <linux/platform_data/leds-s3c24xx.h>
 #include <mach/irqs.h>
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 #include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 #include <linux/platform_data/mmc-s3cmci.h>
@@ -47,9 +47,9 @@
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/cpu.h>
+#include "cpu.h"
 
 #include <sound/s3c24xx_uda134x.h>
 

arch/arm/mach-s3c/mach-mini6410.c

@@ -23,17 +23,17 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <mach/map.h>
+#include "map.h"
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
 #include <linux/soc/samsung/s3c-adc.h>
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/fb.h>
+#include "fb.h"
 #include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <linux/platform_data/mmc-sdhci-s3c.h>
-#include <plat/sdhci.h>
+#include "sdhci.h"
 #include <linux/platform_data/touchscreen-s3c2410.h>
 #include <mach/irqs.h>
 

arch/arm/mach-s3c/mach-n30.c

@@ -27,15 +27,15 @@
 #include <linux/io.h>
 #include <linux/mmc/host.h>
 
-#include <mach/hardware-s3c24xx.h>
+#include "hardware-s3c24xx.h"
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
 #include <linux/platform_data/fb-s3c2410.h>
 #include <linux/platform_data/leds-s3c24xx.h>
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
 
 #include <asm/mach/arch.h>
 #include <asm/mach/irq.h>
@@ -43,9 +43,8 @@
 
 #include <linux/platform_data/i2c-s3c2410.h>
 
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/gpio-cfg.h>
 #include <linux/platform_data/mmc-s3cmci.h>
 #include <linux/platform_data/usb-s3c2410_udc.h>
 

arch/arm/mach-s3c/mach-ncp.c

@@ -25,16 +25,16 @@
 #include <asm/mach/irq.h>
 
 #include <mach/irqs.h>
-#include <mach/map.h>
+#include "map.h"
 
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
 #include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/fb.h>
+#include "fb.h"
 
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/cpu.h>
+#include "cpu.h"
 
 #include "s3c64xx.h"
 

arch/arm/mach-s3c/mach-nexcoder.c

@@ -32,13 +32,13 @@
 #include <asm/mach-types.h>
 
 //#include <asm/debug-ll.h>
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 #include <linux/platform_data/i2c-s3c2410.h>
 
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/cpu.h>
+#include "cpu.h"
 
 #include "s3c24xx.h"
 

arch/arm/mach-s3c/mach-osiris-dvs.c

@@ -15,7 +15,7 @@
 #include <linux/mfd/tps65010.h>
 
 #include <linux/soc/samsung/s3c-cpu-freq.h>
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
 #define OSIRIS_GPIO_DVS	S3C2410_GPB(5)
 

arch/arm/mach-s3c/mach-osiris.c

@@ -36,13 +36,13 @@
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
-#include <plat/cpu.h>
+#include "cpu.h"
 #include <linux/soc/samsung/s3c-cpu-freq.h>
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
 
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
 #include "s3c24xx.h"
 #include "osiris.h"

arch/arm/mach-s3c/mach-otom.c

@@ -22,12 +22,11 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/regs-gpio.h>
+#include "gpio-samsung.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-cfg.h"
-#include <plat/gpio-cfg.h>
 
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/devs.h>
+#include "devs.h"
 
 #include "s3c24xx.h"
 #include "otom.h"

arch/arm/mach-s3c/mach-qt2410.c

@@ -36,12 +36,12 @@
 #include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <linux/platform_data/usb-s3c2410_udc.h>
 #include <linux/platform_data/i2c-s3c2410.h>
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/pm.h>
+#include "pm.h"
 
 #include "s3c24xx.h"
 #include "common-smdk-s3c24xx.h"

arch/arm/mach-s3c/mach-real6410.c

@@ -24,15 +24,15 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <mach/map.h>
+#include "map.h"
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 #include <mach/irqs.h>
 
 #include <linux/soc/samsung/s3c-adc.h>
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/fb.h>
+#include "fb.h"
 #include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <linux/platform_data/touchscreen-s3c2410.h>
 

arch/arm/mach-s3c/mach-rx1950.c

@@ -46,14 +46,14 @@
 
 #include <sound/uda1380.h>
 
-#include <mach/hardware-s3c24xx.h>
+#include "hardware-s3c24xx.h"
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/pm.h>
+#include "pm.h"
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
 
 #include "s3c24xx.h"
 #include "h1940.h"

arch/arm/mach-s3c/mach-rx3715.c

@@ -35,13 +35,13 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
 
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/pm.h>
+#include "pm.h"
 
 #include "s3c24xx.h"
 #include "h1940.h"

arch/arm/mach-s3c/mach-s3c2416-dt.c

@@ -16,10 +16,10 @@
 #include <linux/serial_s3c.h>
 
 #include <asm/mach/arch.h>
-#include <mach/map.h>
+#include "map.h"
 
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/pm.h>
+#include "pm.h"
 
 #include "s3c24xx.h"
 

arch/arm/mach-s3c/mach-s3c64xx-dt.c

@@ -8,8 +8,8 @@
 #include <asm/mach/map.h>
 #include <asm/system_misc.h>
 
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <mach/map.h>
+#include "map.h"
 
 #include "s3c64xx.h"
 

arch/arm/mach-s3c/mach-smartq.c

@@ -18,17 +18,17 @@
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
 
-#include <mach/map.h>
+#include "map.h"
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/devs.h>
+#include "devs.h"
 #include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
 #include <linux/platform_data/hwmon-s3c.h>
 #include <linux/platform_data/usb-ohci-s3c2410.h>
-#include <plat/sdhci.h>
+#include "sdhci.h"
 #include <linux/platform_data/touchscreen-s3c2410.h>
 
 #include <video/platform_lcd.h>

arch/arm/mach-s3c/mach-smartq5.c

@@ -15,14 +15,14 @@
 
 #include <video/samsung_fimd.h>
 #include <mach/irqs.h>
-#include <mach/map.h>
+#include "map.h"
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/fb.h>
+#include "fb.h"
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
 
 #include "s3c64xx.h"
 #include "mach-smartq.h"

arch/arm/mach-s3c/mach-smartq7.c

@@ -15,14 +15,14 @@
 
 #include <video/samsung_fimd.h>
 #include <mach/irqs.h>
-#include <mach/map.h>
+#include "map.h"
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/fb.h>
+#include "fb.h"
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
 
 #include "s3c64xx.h"
 #include "mach-smartq.h"

arch/arm/mach-s3c/mach-smdk2410.c

@@ -19,8 +19,8 @@
 #include <linux/serial_s3c.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -31,8 +31,8 @@
 
 #include <linux/platform_data/i2c-s3c2410.h>
 
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/cpu.h>
+#include "cpu.h"
 
 #include "s3c24xx.h"
 #include "common-smdk-s3c24xx.h"

arch/arm/mach-s3c/mach-smdk2413.c

@@ -23,23 +23,23 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/hardware-s3c24xx.h>
 #include <asm/hardware/iomd.h>
 #include <asm/setup.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
 //#include <asm/debug-ll.h>
-#include <mach/regs-gpio.h>
+#include "hardware-s3c24xx.h"
+#include "regs-gpio.h"
 
 #include <linux/platform_data/usb-s3c2410_udc.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 #include <linux/platform_data/fb-s3c2410.h>
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
 
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/cpu.h>
+#include "cpu.h"
 
 #include "s3c24xx.h"
 #include "common-smdk-s3c24xx.h"

arch/arm/mach-s3c/mach-smdk2416.c

@@ -25,26 +25,26 @@
 #include <asm/mach/irq.h>
 
 #include <video/samsung_fimd.h>
-#include <mach/hardware-s3c24xx.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <mach/regs-gpio.h>
+#include "hardware-s3c24xx.h"
-#include <mach/regs-s3c2443-clock.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "regs-s3c2443-clock.h"
+#include "gpio-samsung.h"
 
 #include <linux/platform_data/leds-s3c24xx.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/cpu.h>
+#include "cpu.h"
 #include <linux/platform_data/mtd-nand-s3c2410.h>
-#include <plat/sdhci.h>
+#include "sdhci.h"
 #include <linux/platform_data/usb-s3c2410_udc.h>
 #include <linux/platform_data/s3c-hsudc.h>
 
-#include <plat/fb.h>
+#include "fb.h"
 
 #include "s3c24xx.h"
 #include "common-smdk-s3c24xx.h"

arch/arm/mach-s3c/mach-smdk2440.c

@@ -26,15 +26,15 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
 
 #include <linux/platform_data/fb-s3c2410.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/cpu.h>
+#include "cpu.h"
 
 #include "s3c24xx.h"
 #include "common-smdk-s3c24xx.h"

arch/arm/mach-s3c/mach-smdk2443.c

@@ -25,13 +25,13 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
 
 #include <linux/platform_data/fb-s3c2410.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/cpu.h>
+#include "cpu.h"
 
 #include "s3c24xx.h"
 #include "common-smdk-s3c24xx.h"

arch/arm/mach-s3c/mach-smdk6400.c

@@ -23,12 +23,12 @@
 #include <asm/mach/irq.h>
 
 #include <mach/irqs.h>
-#include <mach/map.h>
+#include "map.h"
 
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/cpu.h>
+#include "cpu.h"
 #include <linux/platform_data/i2c-s3c2410.h>
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
 #include "s3c64xx.h"
 

arch/arm/mach-s3c/mach-smdk6410.c

@@ -46,23 +46,23 @@
 #include <asm/mach/irq.h>
 
 #include <mach/irqs.h>
-#include <mach/map.h>
+#include "map.h"
 
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 #include <linux/platform_data/ata-samsung_cf.h>
 #include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/fb.h>
+#include "fb.h"
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
 
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/cpu.h>
+#include "cpu.h"
 #include <linux/soc/samsung/s3c-adc.h>
 #include <linux/platform_data/touchscreen-s3c2410.h>
-#include <plat/keypad.h>
+#include "keypad.h"
 
 #include "backlight-s3c64xx.h"
 #include "s3c64xx.h"

arch/arm/mach-s3c/mach-tct_hammer.c

@@ -29,8 +29,8 @@
 #include <asm/mach-types.h>
 
 #include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/cpu.h>
+#include "cpu.h"
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>

arch/arm/mach-s3c/mach-vr1000.c

@@ -35,12 +35,12 @@
 #include <linux/platform_data/i2c-s3c2410.h>
 #include <linux/platform_data/asoc-s3c24xx_simtec.h>
 
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
+#include "gpio-cfg.h"
 
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/gpio-cfg.h>
 
 #include "bast.h"
 #include "s3c24xx.h"

arch/arm/mach-s3c/mach-vstms.c

@@ -28,17 +28,17 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
 
 #include <linux/platform_data/fb-s3c2410.h>
 
 #include <linux/platform_data/i2c-s3c2410.h>
 #include <linux/platform_data/mtd-nand-s3c2410.h>
 
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/cpu.h>
+#include "cpu.h"
 
 #include "s3c24xx.h"
 

arch/arm/mach-s3c/map-s3c.h

@@ -9,7 +9,7 @@
 #ifndef __ASM_PLAT_MAP_S3C_H
 #define __ASM_PLAT_MAP_S3C_H __FILE__
 
-#include <mach/map.h>
+#include "map.h"
 
 #define S3C24XX_VA_IRQ		S3C_VA_IRQ
 #define S3C24XX_VA_MEMCTRL	S3C_VA_MEM
@@ -65,6 +65,6 @@ extern void __iomem *s3c24xx_va_gpio2;
 #define S3C24XX_VA_GPIO2 S3C24XX_VA_GPIO
 #endif
 
-#include <plat/map-s5p.h>
+#include "map-s5p.h"
 
 #endif /* __ASM_PLAT_MAP_S3C_H */

arch/arm/mach-s3c/map-s3c24xx.h

@@ -9,8 +9,8 @@
 #ifndef __ASM_ARCH_MAP_H
 #define __ASM_ARCH_MAP_H
 
-#include <plat/map-base.h>
+#include <mach/map-base.h>
-#include <plat/map-s3c.h>
+#include "map-s3c.h"
 
 /*
  * interrupt controller is the first thing we put in, to make

arch/arm/mach-s3c/map-s3c64xx.h

@@ -11,8 +11,8 @@
 #ifndef __ASM_ARCH_MAP_H
 #define __ASM_ARCH_MAP_H __FILE__
 
-#include <plat/map-base.h>
+#include <mach/map-base.h>
-#include <plat/map-s3c.h>
+#include "map-s3c.h"
 
 /*
  * Post-mux Chip Select Regions Xm0CSn_

arch/arm/mach-s3c/map-s5p.h

@@ -15,6 +15,6 @@
 #define VA_VIC2			VA_VIC(2)
 #define VA_VIC3			VA_VIC(3)
 
-#include <plat/map-s3c.h>
+#include "map-s3c.h"
 
 #endif /* __ASM_PLAT_MAP_S5P_H */

arch/arm/mach-s3c/pl080.c

@@ -10,9 +10,9 @@
 #include <linux/amba/pl08x.h>
 #include <linux/of.h>
 
-#include <plat/cpu.h>
+#include "cpu.h"
 #include <mach/irqs.h>
-#include <mach/map.h>
+#include "map.h"
 
 #include "regs-sys-s3c64xx.h"
 

arch/arm/mach-s3c/platformdata.c

@@ -9,8 +9,8 @@
 #include <linux/string.h>
 #include <linux/platform_device.h>
 
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/sdhci.h>
+#include "sdhci.h"
 
 void __init *s3c_set_platdata(void *pd, size_t pdsize,
 			      struct platform_device *pdev)

arch/arm/mach-s3c/pm-common.c

@@ -12,7 +12,7 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 
-#include <plat/pm-common.h>
+#include "pm-common.h"
 
 /* helper functions to save and restore register state */
 

arch/arm/mach-s3c/pm-core-s3c64xx.h

@@ -14,9 +14,9 @@
 #include <linux/serial_s3c.h>
 #include <linux/delay.h>
 
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/regs-clock.h>
+#include "regs-clock.h"
-#include <mach/map.h>
+#include "map.h"
 
 static inline void s3c_pm_debug_init_uart(void)
 {

arch/arm/mach-s3c/pm-gpio.c

@@ -13,10 +13,10 @@
 #include <linux/io.h>
 #include <linux/gpio.h>
 
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
-#include <plat/gpio-core.h>
+#include "gpio-core.h"
-#include <plat/pm.h>
+#include "pm.h"
 
 /* PM GPIO helpers */
 

arch/arm/mach-s3c/pm-h1940.S

@@ -7,9 +7,9 @@
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <mach/map.h>
+#include "map.h"
 
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
 
 	.text
 	.global	h1940_pm_return

arch/arm/mach-s3c/pm-s3c2410.c

@@ -16,12 +16,12 @@
 
 #include <asm/mach-types.h>
 
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/pm.h>
+#include "pm.h"
 
 #include "h1940.h"
 

arch/arm/mach-s3c/pm-s3c2412.c

@@ -20,11 +20,11 @@
 #include <asm/irq.h>
 
 #include <mach/irqs.h>
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
 
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/pm.h>
+#include "pm.h"
-#include <plat/wakeup-mask.h>
+#include "wakeup-mask.h"
 
 #include "regs-dsc-s3c24xx.h"
 #include "s3c2412-power.h"

arch/arm/mach-s3c/pm-s3c2416.c

@@ -11,10 +11,10 @@
 
 #include <asm/cacheflush.h>
 
-#include <mach/regs-s3c2443-clock.h>
+#include "regs-s3c2443-clock.h"
 
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/pm.h>
+#include "pm.h"
 
 #include "s3c2412-power.h"
 

arch/arm/mach-s3c/pm-s3c24xx.c

@@ -21,15 +21,15 @@
 #include <linux/serial_s3c.h>
 #include <linux/io.h>
 
-#include <mach/regs-clock.h>
+#include "regs-clock.h"
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/regs-irq.h>
+#include "regs-irq.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
 #include <asm/mach/time.h>
 
-#include <plat/gpio-cfg.h>
+#include "gpio-cfg.h"
-#include <plat/pm.h>
+#include "pm.h"
 
 #include "regs-mem-s3c24xx.h"
 

arch/arm/mach-s3c/pm-s3c64xx.c

@@ -14,17 +14,17 @@
 #include <linux/gpio.h>
 #include <linux/pm_domain.h>
 
-#include <mach/map.h>
+#include "map.h"
 #include <mach/irqs.h>
 
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/devs.h>
+#include "devs.h"
-#include <plat/pm.h>
+#include "pm.h"
-#include <plat/wakeup-mask.h>
+#include "wakeup-mask.h"
 
-#include <mach/regs-gpio.h>
+#include "regs-gpio.h"
-#include <mach/regs-clock.h>
+#include "regs-clock.h"
-#include <mach/gpio-samsung.h>
+#include "gpio-samsung.h"
 
 #include "regs-gpio-memport-s3c64xx.h"
 #include "regs-modem-s3c64xx.h"

arch/arm/mach-s3c/pm.c

@@ -18,16 +18,16 @@
 #include <asm/cacheflush.h>
 #include <asm/suspend.h>
 
-#include <mach/map.h>
+#include "map.h"
-#include <mach/regs-clock.h>
+#include "regs-clock.h"
-#include <mach/regs-irq.h>
+#include "regs-irq.h"
 #include <mach/irqs.h>
 
 #include <asm/irq.h>
 
-#include <plat/cpu.h>
+#include "cpu.h"
-#include <plat/pm.h>
+#include "pm.h"
-#include <mach/pm-core.h>
+#include "pm-core.h"
 
 /* for external use */
 

arch/arm/mach-s3c/pm.h

@@ -11,7 +11,7 @@
  * management
 */
 
-#include <plat/pm-common.h>
+#include "pm-common.h"
 
 struct device;