diff options
| author | Roland Stigge <stigge@antcom.de> | 2012-03-13 21:15:40 +0100 |
|---|---|---|
| committer | Roland Stigge <stigge@antcom.de> | 2012-03-13 21:15:40 +0100 |
| commit | a7e4c6a7145ee375a688e1701ae4c975d6c6419a (patch) | |
| tree | 0438b5b99a88ec694bb5a91c8ca0cb52fec928f1 /arch/arm/mach-lpc32xx/phy3250.c | |
| parent | Merge branch 'lpc32xx/fixup2' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | ARM: LPC32xx: ADC support for mach-lpc32xx (diff) | |
| download | linux-a7e4c6a7145ee375a688e1701ae4c975d6c6419a.tar.xz linux-a7e4c6a7145ee375a688e1701ae4c975d6c6419a.zip | |
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/phy3250.c')
| -rw-r--r-- | arch/arm/mach-lpc32xx/phy3250.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c index 945a2f24d5e9..4590a8b52e72 100644 --- a/arch/arm/mach-lpc32xx/phy3250.c +++ b/arch/arm/mach-lpc32xx/phy3250.c @@ -278,6 +278,7 @@ static struct platform_device *phy3250_devs[] __initdata = { &lpc32xx_i2c2_device, &lpc32xx_watchdog_device, &lpc32xx_gpio_led_device, + &lpc32xx_adc_device, }; static struct amba_device *amba_devs[] __initdata = { |