diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-11 12:43:11 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-11 12:43:11 -0400 |
| commit | e7578c08a4dee36fe01fb38805f325689e642eb0 (patch) | |
| tree | 7426054f6226aa2349ee0c0a3970aeef9276ea59 /arch/arm/mach-ixp2000/ixdp2x00.c | |
| parent | 763b3917e779c9c25d56fc71a796774185cd6ce2 (diff) | |
| parent | 5c23804a0941a111752fdacefe0bea2db1b4d93f (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/arm/mach-ixp2000/ixdp2x00.c')
| -rw-r--r-- | arch/arm/mach-ixp2000/ixdp2x00.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c index 5e4380747b53..a43369ad876c 100644 --- a/arch/arm/mach-ixp2000/ixdp2x00.c +++ b/arch/arm/mach-ixp2000/ixdp2x00.c | |||
| @@ -303,5 +303,6 @@ void __init ixdp2x00_init_machine(void) | |||
| 303 | gpio_line_config(IXDP2X00_GPIO_I2C_ENABLE, GPIO_OUT); | 303 | gpio_line_config(IXDP2X00_GPIO_I2C_ENABLE, GPIO_OUT); |
| 304 | 304 | ||
| 305 | platform_add_devices(ixdp2x00_devices, ARRAY_SIZE(ixdp2x00_devices)); | 305 | platform_add_devices(ixdp2x00_devices, ARRAY_SIZE(ixdp2x00_devices)); |
| 306 | ixp2000_uart_init(); | ||
| 306 | } | 307 | } |
| 307 | 308 | ||