Skip to content

Commit

Permalink
Merge branch 'for-rmk' of git://git.marvell.com/orion
Browse files Browse the repository at this point in the history
  • Loading branch information
Russell King authored and Russell King committed Mar 5, 2009
2 parents 559595a + f45964e commit 843e22b
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions arch/arm/mach-orion5x/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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,
};
Expand Down

0 comments on commit 843e22b

Please sign in to comment.