diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-20 05:52:15 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-20 05:52:15 -0400 |
| commit | 7393423dd9b5790a3115873be355e9fc862bce8f (patch) | |
| tree | fc83214602c8ce41dc06d5c8e21deada679521f7 /arch/arm/mach-orion5x/rd88f5182-setup.c | |
| parent | 8df9676d6402563da91427e8d9f2da8a4598aede (diff) | |
| parent | 1fca25427482387689fa27594c992a961d98768f (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'arch/arm/mach-orion5x/rd88f5182-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/rd88f5182-setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c index 8771cb76f0dc..4c3bcd76ac85 100644 --- a/arch/arm/mach-orion5x/rd88f5182-setup.c +++ b/arch/arm/mach-orion5x/rd88f5182-setup.c | |||
| @@ -292,6 +292,7 @@ static void __init rd88f5182_init(void) | |||
| 292 | orion5x_i2c_init(); | 292 | orion5x_i2c_init(); |
| 293 | orion5x_sata_init(&rd88f5182_sata_data); | 293 | orion5x_sata_init(&rd88f5182_sata_data); |
| 294 | orion5x_uart0_init(); | 294 | orion5x_uart0_init(); |
| 295 | orion5x_xor_init(); | ||
| 295 | 296 | ||
| 296 | orion5x_setup_dev_boot_win(RD88F5182_NOR_BOOT_BASE, | 297 | orion5x_setup_dev_boot_win(RD88F5182_NOR_BOOT_BASE, |
| 297 | RD88F5182_NOR_BOOT_SIZE); | 298 | RD88F5182_NOR_BOOT_SIZE); |