git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[pandora-kernel.git]
/
arch
/
arm
/
mach-orion5x
/
mss2-setup.c
diff --git
a/arch/arm/mach-orion5x/mss2-setup.c
b/arch/arm/mach-orion5x/mss2-setup.c
index
4403cc9
..
53ff189
100644
(file)
--- a/
arch/arm/mach-orion5x/mss2-setup.c
+++ b/
arch/arm/mach-orion5x/mss2-setup.c
@@
-239,6
+239,7
@@
static void __init mss2_init(void)
orion5x_i2c_init();
orion5x_sata_init(&mss2_sata_data);
orion5x_uart0_init();
+ orion5x_xor_init();
orion5x_setup_dev_boot_win(MSS2_NOR_BOOT_BASE, MSS2_NOR_BOOT_SIZE);
platform_device_register(&mss2_nor_flash);