diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-26 00:49:57 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-26 00:49:57 -0800 |
| commit | d98eb5cfb0ac050ed8c8fafd029b94d451189864 (patch) | |
| tree | 2a0665bf9fe2f8ece2b8824f898b1dd4cc88c869 /arch/arm/mach-kirkwood/sheevaplug-setup.c | |
| parent | 0f9cb211ba5db93d488fe6b154138231fdd0e22d (diff) | |
| parent | 4a9329a04ceec56fc1ec155b6ea4d8b50f350a7b (diff) | |
Merge tag 'orion_cleanup_for_3.8' of git://git.infradead.org/users/jcooper/linux into next/cleanup
From Jason Cooper:
orion cleanup for v3.8
- remove unused includes in kirkwood
- fix sparse warnings in kirkwood
- checkpatch cleanup in kirkwood
- use common code in pcie on kirkwood
* tag 'orion_cleanup_for_3.8' of git://git.infradead.org/users/jcooper/linux:
ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan
ARM: Kirkwood: checkpatch cleanups
ARM: Kirkwood: Fix sparse warnings.
ARM: Kirkwood: Remove unused includes
ARM: kirkwood: cleanup lsxl board includes
Diffstat (limited to 'arch/arm/mach-kirkwood/sheevaplug-setup.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/sheevaplug-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c index 28d0abaf4bd9..8a175948b28d 100644 --- a/arch/arm/mach-kirkwood/sheevaplug-setup.c +++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c @@ -117,7 +117,7 @@ static void __init sheevaplug_init(void) if (gpio_request(29, "USB Power Enable") != 0 || gpio_direction_output(29, 1) != 0) - printk(KERN_ERR "can't set up GPIO 29 (USB Power Enable)\n"); + pr_err("can't set up GPIO 29 (USB Power Enable)\n"); kirkwood_ehci_init(); kirkwood_ge00_init(&sheevaplug_ge00_data); |