diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-05 08:33:31 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 08:33:31 -0500 |
| commit | 43769f10b4826376cbf4ce17af74a5b4e8dc4fcd (patch) | |
| tree | 8a7f36985f9ef8e6771163c751eeefd22ee71693 /arch/arm/mach-sa1100/generic.c | |
| parent | ae7462b4f1fe1f36b5d562dbd5202a2eba01f072 (diff) | |
| parent | eda58a85ec3fc05855a26654d97a2b53f0e715b9 (diff) | |
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
Diffstat (limited to 'arch/arm/mach-sa1100/generic.c')
| -rw-r--r-- | arch/arm/mach-sa1100/generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c index c1fbd5b5f9c4..23cfdd593954 100644 --- a/arch/arm/mach-sa1100/generic.c +++ b/arch/arm/mach-sa1100/generic.c | |||
| @@ -289,7 +289,7 @@ static struct platform_device sa11x0pcmcia_device = { | |||
| 289 | }; | 289 | }; |
| 290 | 290 | ||
| 291 | static struct platform_device sa11x0mtd_device = { | 291 | static struct platform_device sa11x0mtd_device = { |
| 292 | .name = "flash", | 292 | .name = "sa1100-mtd", |
| 293 | .id = -1, | 293 | .id = -1, |
| 294 | }; | 294 | }; |
| 295 | 295 | ||