diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:35:40 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:35:40 +0200 |
| commit | 429b022af41108f6942d72547592b1d30e9a51f0 (patch) | |
| tree | 7d68355529718018cdad1241285816c6f64620b2 /arch/arm/mach-orion5x/mv2120-setup.c | |
| parent | 0cd418ddb1ee88df7d16d5df06cb2da68eceb9e4 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge commit 'v2.6.27-rc6' into core/rcu
Diffstat (limited to 'arch/arm/mach-orion5x/mv2120-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/mv2120-setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-orion5x/mv2120-setup.c b/arch/arm/mach-orion5x/mv2120-setup.c index 67b2c0df615..978d4d59939 100644 --- a/arch/arm/mach-orion5x/mv2120-setup.c +++ b/arch/arm/mach-orion5x/mv2120-setup.c @@ -203,6 +203,7 @@ static void __init mv2120_init(void) orion5x_i2c_init(); orion5x_sata_init(&mv2120_sata_data); orion5x_uart0_init(); + orion5x_xor_init(); orion5x_setup_dev_boot_win(MV2120_NOR_BOOT_BASE, MV2120_NOR_BOOT_SIZE); platform_device_register(&mv2120_nor_flash); |