diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 02:10:07 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 02:10:07 -0400 |
| commit | e14eee56c2280953c6e3d24d5dce42bd90836b81 (patch) | |
| tree | 21ab792d9ad6fbbab460058f352a0158f995644e /arch/arm/mach-omap2/board-ldp.c | |
| parent | d6ee6f7e4c74d9a0fed7544f4d389bde004651d3 (diff) | |
| parent | 99adcd9d67aaf04e28f5ae96df280f236bde4b66 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/arm/mach-omap2/board-ldp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-ldp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index f6a13451d1fd..6031e179926b 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c | |||
| @@ -81,7 +81,7 @@ static inline void __init ldp_init_smc911x(void) | |||
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | ldp_smc911x_resources[0].start = cs_mem_base + 0x0; | 83 | ldp_smc911x_resources[0].start = cs_mem_base + 0x0; |
| 84 | ldp_smc911x_resources[0].end = cs_mem_base + 0xf; | 84 | ldp_smc911x_resources[0].end = cs_mem_base + 0xff; |
| 85 | udelay(100); | 85 | udelay(100); |
| 86 | 86 | ||
| 87 | eth_gpio = LDP_SMC911X_GPIO; | 87 | eth_gpio = LDP_SMC911X_GPIO; |