diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 14:34:05 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 16:50:56 +0200 |
| commit | 0dc488e778069b208d09516c5f0793dc37023c8e (patch) | |
| tree | 704ad7fa4d8202f1933297e4dd348128a2b9f702 /arch/arm/mach-s5pv210 | |
| parent | c4c54da24b8ae12abb2034edaf08021894caf0d0 (diff) | |
| parent | bd51de53e1be9896d815bbea30560262216d4616 (diff) | |
| download | op-kernel-dev-0dc488e778069b208d09516c5f0793dc37023c8e.zip op-kernel-dev-0dc488e778069b208d09516c5f0793dc37023c8e.tar.gz | |
Merge branch 'samsung/exynos-multiplatform' into next/drivers
Merging this into the next/drivers branch avoids a number of
pointless conflicts with code changed here.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-s5pv210')
| -rw-r--r-- | arch/arm/mach-s5pv210/include/mach/debug-macro.S | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/setup-sdhci-gpio.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pv210/include/mach/debug-macro.S b/arch/arm/mach-s5pv210/include/mach/debug-macro.S index 79e5559..80c2199 100644 --- a/arch/arm/mach-s5pv210/include/mach/debug-macro.S +++ b/arch/arm/mach-s5pv210/include/mach/debug-macro.S @@ -38,4 +38,4 @@ * will be fine with us. */ -#include <plat/debug-macro.S> +#include <debug/samsung.S> diff --git a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c index 3e3ac05..0512ada 100644 --- a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c +++ b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c @@ -20,7 +20,6 @@ #include <linux/mmc/card.h> #include <plat/gpio-cfg.h> -#include <plat/regs-sdhci.h> #include <plat/sdhci.h> void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width) |
