diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 12:00:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 12:00:33 -0500 |
| commit | 3d14b5beba35250c548d3851a2b84fce742d8311 (patch) | |
| tree | 065e3d93c3fcbc5ee4c44fa78662393cddbdf6de /arch/arm/mach-sa1100/hackkit.c | |
| parent | 0719dc341389882cc834ed18fc9b7fc6006b2b85 (diff) | |
| parent | 1bf8e6219552d5dd27012d567ec8c4bb9c2d86b4 (diff) | |
Merge branch 'sa1100' into devel
Diffstat (limited to 'arch/arm/mach-sa1100/hackkit.c')
| -rw-r--r-- | arch/arm/mach-sa1100/hackkit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/hackkit.c b/arch/arm/mach-sa1100/hackkit.c index e7056c0b562c..51568dfc8e97 100644 --- a/arch/arm/mach-sa1100/hackkit.c +++ b/arch/arm/mach-sa1100/hackkit.c | |||
| @@ -187,7 +187,7 @@ static struct resource hackkit_flash_resource = { | |||
| 187 | 187 | ||
| 188 | static void __init hackkit_init(void) | 188 | static void __init hackkit_init(void) |
| 189 | { | 189 | { |
| 190 | sa11x0_set_flash_data(&hackkit_flash_data, &hackkit_flash_resource, 1); | 190 | sa11x0_register_mtd(&hackkit_flash_data, &hackkit_flash_resource, 1); |
| 191 | } | 191 | } |
| 192 | 192 | ||
| 193 | /********************************************************************** | 193 | /********************************************************************** |