diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-25 17:44:18 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-25 17:44:18 -0400 |
| commit | 54f53f2b94feb72622bec7a8563fc487d9f97720 (patch) | |
| tree | ab0c4e1dcadd25a00fa7a4febf41bc43b864cf73 /arch/arm/mach-iop13xx/setup.c | |
| parent | f61fb8a52cdf8b9b6a6badde84aefe58cb35d315 (diff) | |
| parent | a4083c9271e0a697278e089f2c0b9a95363ada0a (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/arm/mach-iop13xx/setup.c')
| -rw-r--r-- | arch/arm/mach-iop13xx/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-iop13xx/setup.c b/arch/arm/mach-iop13xx/setup.c index bfe0c87e3397..246f6d478720 100644 --- a/arch/arm/mach-iop13xx/setup.c +++ b/arch/arm/mach-iop13xx/setup.c | |||
| @@ -519,7 +519,7 @@ void __init iop13xx_platform_init(void) | |||
| 519 | if (iq8134x_flash_resource.end > iq8134x_flash_resource.start) | 519 | if (iq8134x_flash_resource.end > iq8134x_flash_resource.start) |
| 520 | iop13xx_devices[plat_idx++] = &iq8134x_flash; | 520 | iop13xx_devices[plat_idx++] = &iq8134x_flash; |
| 521 | else | 521 | else |
| 522 | printk(KERN_ERR "%s: Failed to probe flash size\n", __FUNCTION__); | 522 | printk(KERN_ERR "%s: Failed to probe flash size\n", __func__); |
| 523 | #endif | 523 | #endif |
| 524 | 524 | ||
| 525 | platform_add_devices(iop13xx_devices, plat_idx); | 525 | platform_add_devices(iop13xx_devices, plat_idx); |