diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-16 01:45:22 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-16 01:45:22 +0300 |
| commit | fb4f0424293a0fb75d0c9edbc16bd618930ff2da (patch) | |
| tree | 65a27a478b52ac1208ff135009ea809c0dc5acdb /include/linux | |
| parent | 35d3aad49223aaf9f54510145fd674134e117321 (diff) | |
| parent | b28210421c329766275b020ffeadce0a4e9d551f (diff) | |
| download | linux-fb4f0424293a0fb75d0c9edbc16bd618930ff2da.tar.xz | |
Merge branch 's3c64xx/multiplatform' into next/multiplatform
* s3c64xx/multiplatform:
ARM: s3c64xx: allow building without board support
ARM: s3c64xx: multiplatform support
ARM: s3c64xx: use common debug-ll implementation
ARM: s3c64xx: use new adc/touchscreen driver
iio: exynos-adc: add experimental touchscreen support
ARM: s3c64xx: enable sparse IRQ support
ARM: s3c64xx: prepare initcalls for multiplatform
gpio: samsung: move gpio-samsung driver back to platform code
ASoC: samsung/smartq: use dynamic registration
Input: s3c2410_ts: fix S3C_ADC dependency
Conflicts:
arch/arm/Kconfig.debug
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/platform_data/touchscreen-s3c2410.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/platform_data/touchscreen-s3c2410.h b/include/linux/platform_data/touchscreen-s3c2410.h index 58dc7c5ae63b..71eccaa9835d 100644 --- a/include/linux/platform_data/touchscreen-s3c2410.h +++ b/include/linux/platform_data/touchscreen-s3c2410.h @@ -17,6 +17,7 @@ struct s3c2410_ts_mach_info { }; extern void s3c24xx_ts_set_platdata(struct s3c2410_ts_mach_info *); +extern void s3c64xx_ts_set_platdata(struct s3c2410_ts_mach_info *); /* defined by architecture to configure gpio */ extern void s3c24xx_ts_cfg_gpio(struct platform_device *dev); |