Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 20429
b: refs/heads/master
c: 3dfaf7a
h: refs/heads/master
i:
  20427: 63a43fa
v: v3
  • Loading branch information
Martin Michlmayr authored and Russell King committed Feb 16, 2006
1 parent f6833b2 commit ec1dbbe
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7bbb79403163e047c6e333ff169db34e3c969e65
refs/heads/master: 3dfaf7a68e275a1a6bee4861fdd61f911e6eb7a2
6 changes: 4 additions & 2 deletions trunk/arch/arm/mach-ixp4xx/nslu2-setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ static struct flash_platform_data nslu2_flash_data = {
};

static struct resource nslu2_flash_resource = {
.start = NSLU2_FLASH_BASE,
.end = NSLU2_FLASH_BASE + NSLU2_FLASH_SIZE,
.flags = IORESOURCE_MEM,
};

Expand Down Expand Up @@ -116,6 +114,10 @@ static void __init nslu2_init(void)
{
ixp4xx_sys_init();

nslu2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
nslu2_flash_resource.end =
IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;

pm_power_off = nslu2_power_off;

platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices));
Expand Down

0 comments on commit ec1dbbe

Please sign in to comment.