diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-03 10:18:31 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-03 10:18:34 +1100 |
| commit | 4e7cd87f6ef453981ef6c4c7c8c06ca096a00d14 (patch) | |
| tree | 126b89b809954a8de34b0a49fd9cf81691dfb6d9 /arch/arm/mach-s3c24xx/include/mach/hardware.h | |
| parent | b6a6ed84f9e21a830f58b2876b4d3a4741cf1056 (diff) | |
| parent | e98cd7220a1b8adcd974781eef40651952ec5b4c (diff) | |
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
Documentation/devicetree/bindings/iio/adc/at91_adc.txt
Documentation/devicetree/bindings/phy/samsung-phy.txt
arch/arm/boot/dts/imx53-qsb.dts
arch/arm/boot/dts/keystone-clocks.dtsi
arch/arm/boot/dts/sun7i-a20.dtsi
arch/arm/mach-imx/pm-imx6q.c
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-tegra/Kconfig
arch/arm/mach-zynq/Kconfig
arch/arm/mach-zynq/common.c
drivers/clocksource/Kconfig
drivers/phy/Kconfig
drivers/watchdog/Kconfig
drivers/watchdog/orion_wdt.c
include/asm-generic/vmlinux.lds.h
sound/soc/kirkwood/Kconfig
Diffstat (limited to 'arch/arm/mach-s3c24xx/include/mach/hardware.h')
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/hardware.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/mach-s3c24xx/include/mach/hardware.h b/arch/arm/mach-s3c24xx/include/mach/hardware.h index a6cc14a092fc..dedd3837c193 100644 --- a/arch/arm/mach-s3c24xx/include/mach/hardware.h +++ b/arch/arm/mach-s3c24xx/include/mach/hardware.h @@ -1,5 +1,4 @@ -/* arch/arm/mach-s3c2410/include/mach/hardware.h - * +/* * Copyright (c) 2003 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> * @@ -17,20 +16,9 @@ extern unsigned int s3c2410_modify_misccr(unsigned int clr, unsigned int chg); -#ifdef CONFIG_CPU_S3C2440 - -extern int s3c2440_set_dsc(unsigned int pin, unsigned int value); - -#endif /* CONFIG_CPU_S3C2440 */ - #endif /* __ASSEMBLY__ */ #include <asm/sizes.h> #include <mach/map.h> -/* machine specific hardware definitions should go after this */ - -/* currently here until moved into config (todo) */ -#define CONFIG_NO_MULTIWORD_IO - #endif /* __ASM_ARCH_HARDWARE_H */ |