diff options
author | Nicolas Pitre <nico@cam.org> | 2009-03-15 21:41:23 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@cam.org> | 2009-03-15 21:41:23 -0400 |
commit | d6f818f71fa5db79969aaecba302745199376169 (patch) | |
tree | fcdedce488db0f80c7a816e0b52df83a01972838 /arch/arm/mach-orion5x | |
parent | ace14b82633960a2b6bf6a0b2640c63872a65562 (diff) | |
parent | 305b07680f6c6a7e59f996c5bd85f009caff5bb1 (diff) | |
download | kernel_samsung_tuna-d6f818f71fa5db79969aaecba302745199376169.zip kernel_samsung_tuna-d6f818f71fa5db79969aaecba302745199376169.tar.gz kernel_samsung_tuna-d6f818f71fa5db79969aaecba302745199376169.tar.bz2 |
Merge commit '305b07680f' into orion/master
Diffstat (limited to 'arch/arm/mach-orion5x')
-rw-r--r-- | arch/arm/mach-orion5x/common.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index 0a62337..8a0e49d 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c @@ -431,6 +431,10 @@ void __init orion5x_uart1_init(void) /***************************************************************************** * XOR engine ****************************************************************************/ +struct mv_xor_platform_shared_data orion5x_xor_shared_data = { + .dram = &orion5x_mbus_dram_info, +}; + static struct resource orion5x_xor_shared_resources[] = { { .name = "xor low", @@ -448,6 +452,9 @@ static struct resource orion5x_xor_shared_resources[] = { static struct platform_device orion5x_xor_shared = { .name = MV_XOR_SHARED_NAME, .id = 0, + .dev = { + .platform_data = &orion5x_xor_shared_data, + }, .num_resources = ARRAY_SIZE(orion5x_xor_shared_resources), .resource = orion5x_xor_shared_resources, }; |