summaryrefslogtreecommitdiff
path: root/arch/arm/mach-lpc32xx/common.h
diff options
context:
space:
mode:
authorRoland Stigge <stigge@antcom.de>2012-03-14 00:15:40 +0400
committerRoland Stigge <stigge@antcom.de>2012-03-14 00:15:40 +0400
commita7e4c6a7145ee375a688e1701ae4c975d6c6419a (patch)
tree0438b5b99a88ec694bb5a91c8ca0cb52fec928f1 /arch/arm/mach-lpc32xx/common.h
parent73d43d00649985cf6509b4f99a720665f1b7c559 (diff)
parent678a0222edc9da43a22145d68647500ee85e6c04 (diff)
downloadlinux-a7e4c6a7145ee375a688e1701ae4c975d6c6419a.tar.xz
Merge branch 'lpc32xx/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into lpc32xx/tmp
Conflicts: arch/arm/mach-lpc32xx/clock.c
Diffstat (limited to 'arch/arm/mach-lpc32xx/common.h')
-rw-r--r--arch/arm/mach-lpc32xx/common.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-lpc32xx/common.h b/arch/arm/mach-lpc32xx/common.h
index 75640bfb097f..68f2e46d98ad 100644
--- a/arch/arm/mach-lpc32xx/common.h
+++ b/arch/arm/mach-lpc32xx/common.h
@@ -29,6 +29,7 @@ extern struct platform_device lpc32xx_i2c0_device;
extern struct platform_device lpc32xx_i2c1_device;
extern struct platform_device lpc32xx_i2c2_device;
extern struct platform_device lpc32xx_tsc_device;
+extern struct platform_device lpc32xx_adc_device;
extern struct platform_device lpc32xx_rtc_device;
/*