diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/arm/mach-sa1100/simpad.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/arm/mach-sa1100/simpad.c')
| -rw-r--r-- | arch/arm/mach-sa1100/simpad.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c index 3c74534f7fe..49cfd64663a 100644 --- a/arch/arm/mach-sa1100/simpad.c +++ b/arch/arm/mach-sa1100/simpad.c | |||
| @@ -166,9 +166,9 @@ static void __init simpad_map_io(void) | |||
| 166 | PCFR = 0; | 166 | PCFR = 0; |
| 167 | PSDR = 0; | 167 | PSDR = 0; |
| 168 | 168 | ||
| 169 | sa11x0_set_flash_data(&simpad_flash_data, simpad_flash_resources, | 169 | sa11x0_register_mtd(&simpad_flash_data, simpad_flash_resources, |
| 170 | ARRAY_SIZE(simpad_flash_resources)); | 170 | ARRAY_SIZE(simpad_flash_resources)); |
| 171 | sa11x0_set_mcp_data(&simpad_mcp_data); | 171 | sa11x0_register_mcp(&simpad_mcp_data); |
| 172 | } | 172 | } |
| 173 | 173 | ||
| 174 | static void simpad_power_off(void) | 174 | static void simpad_power_off(void) |