diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-09 18:03:13 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-09 18:03:13 +0100 |
| commit | 492c71dd545a54dc62df8780bd8d233d771748df (patch) | |
| tree | 73960c90dd47938000478b9b3b1228a8c860e65b /arch/arm/mach-orion5x/kurobox_pro-setup.c | |
| parent | f0af7245f1725fdc39b32b59c20500448437ddbe (diff) | |
| parent | 18365d181fe7fee8b52cd12482200d3a4c48d05e (diff) | |
Merge branch 'for-rmk' of git://git.marvell.com/orion
Diffstat (limited to 'arch/arm/mach-orion5x/kurobox_pro-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/kurobox_pro-setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c index 0caaaac74bc..cb72f1bb9cb 100644 --- a/arch/arm/mach-orion5x/kurobox_pro-setup.c +++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c @@ -25,7 +25,7 @@ #include <asm/mach/arch.h> #include <asm/mach/pci.h> #include <mach/orion5x.h> -#include <asm/plat-orion/orion_nand.h> +#include <plat/orion_nand.h> #include "common.h" #include "mpp.h" @@ -356,6 +356,7 @@ static void __init kurobox_pro_init(void) orion5x_sata_init(&kurobox_pro_sata_data); orion5x_uart0_init(); orion5x_uart1_init(); + orion5x_xor_init(); orion5x_setup_dev_boot_win(KUROBOX_PRO_NOR_BOOT_BASE, KUROBOX_PRO_NOR_BOOT_SIZE); |