Merge branch 'for-rmk' of git://git.marvell.com/orion

This commit is contained in:
Russell King 2009-03-05 09:21:18 +00:00 committed by Russell King
commit 843e22b056

View File

@ -431,6 +431,10 @@ void __init orion5x_uart1_init(void)
/***************************************************************************** /*****************************************************************************
* XOR engine * XOR engine
****************************************************************************/ ****************************************************************************/
struct mv_xor_platform_shared_data orion5x_xor_shared_data = {
.dram = &orion5x_mbus_dram_info,
};
static struct resource orion5x_xor_shared_resources[] = { static struct resource orion5x_xor_shared_resources[] = {
{ {
.name = "xor low", .name = "xor low",
@ -448,6 +452,9 @@ static struct resource orion5x_xor_shared_resources[] = {
static struct platform_device orion5x_xor_shared = { static struct platform_device orion5x_xor_shared = {
.name = MV_XOR_SHARED_NAME, .name = MV_XOR_SHARED_NAME,
.id = 0, .id = 0,
.dev = {
.platform_data = &orion5x_xor_shared_data,
},
.num_resources = ARRAY_SIZE(orion5x_xor_shared_resources), .num_resources = ARRAY_SIZE(orion5x_xor_shared_resources),
.resource = orion5x_xor_shared_resources, .resource = orion5x_xor_shared_resources,
}; };