diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 15:48:42 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 15:48:42 +0100 |
commit | f66f9bdf6d2c2b540f73bb57bd24b886b39beb14 (patch) | |
tree | 03d52df19bd6b7b2c424ed5d94590fcde666ab28 /arch/arm/mach-lpc32xx/phy3250.c | |
parent | Merge branch 'next/devel-samsung-pd' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | Merge branches 'lpc32xx/mach-lpc32xx-eth' and 'lpc32xx/mach-lpc32xx-usb' of g... (diff) | |
download | linux-f66f9bdf6d2c2b540f73bb57bd24b886b39beb14.tar.xz linux-f66f9bdf6d2c2b540f73bb57bd24b886b39beb14.zip |
Merge branch 'lpc32xx/drivers' into next/drivers
Diffstat (limited to 'arch/arm/mach-lpc32xx/phy3250.c')
-rw-r--r-- | arch/arm/mach-lpc32xx/phy3250.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c index a539f4f72f28..7f7401ec7487 100644 --- a/arch/arm/mach-lpc32xx/phy3250.c +++ b/arch/arm/mach-lpc32xx/phy3250.c @@ -37,6 +37,7 @@ #include <mach/hardware.h> #include <mach/platform.h> +#include <mach/board.h> #include <mach/gpio-lpc32xx.h> #include "common.h" @@ -247,12 +248,16 @@ static struct platform_device lpc32xx_gpio_led_device = { }; static struct platform_device *phy3250_devs[] __initdata = { + &lpc32xx_rtc_device, + &lpc32xx_tsc_device, &lpc32xx_i2c0_device, &lpc32xx_i2c1_device, &lpc32xx_i2c2_device, &lpc32xx_watchdog_device, &lpc32xx_gpio_led_device, &lpc32xx_adc_device, + &lpc32xx_ohci_device, + &lpc32xx_net_device, }; static struct amba_device *amba_devs[] __initdata = { |