diff options
| author | Michael Hennerich <michael.hennerich@analog.com> | 2008-05-20 10:42:39 +0200 |
|---|---|---|
| committer | Bryan Wu <cooloney@kernel.org> | 2008-05-20 10:42:39 +0200 |
| commit | f086f23435bf42f700296f1be3878f6aa6e9b7dd (patch) | |
| tree | e5813eac089f8d6cea27ace2dd49cca9eb4063f2 /arch/blackfin | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-f086f23435bf42f700296f1be3878f6aa6e9b7dd.tar.xz linux-f086f23435bf42f700296f1be3878f6aa6e9b7dd.zip | |
Blackfin arch: Cleanup no functional changes
Singed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | arch/blackfin/kernel/gptimers.c | 2 | ||||
| -rw-r--r-- | arch/blackfin/mach-bf548/boards/cm_bf548.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/kernel/gptimers.c b/arch/blackfin/kernel/gptimers.c index e698554895a7..3a3e9615b002 100644 --- a/arch/blackfin/kernel/gptimers.c +++ b/arch/blackfin/kernel/gptimers.c @@ -10,8 +10,8 @@ #include <linux/kernel.h> #include <linux/module.h> +#include <linux/io.h> -#include <asm/io.h> #include <asm/blackfin.h> #include <asm/gptimers.h> diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c index 3b74f96d3590..4f4ae8787edf 100644 --- a/arch/blackfin/mach-bf548/boards/cm_bf548.c +++ b/arch/blackfin/mach-bf548/boards/cm_bf548.c @@ -684,7 +684,7 @@ static struct platform_device *cm_bf548_devices[] __initdata = { static int __init cm_bf548_init(void) { - printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); + printk(KERN_INFO "%s(): registering device resources\n", __func__); platform_add_devices(cm_bf548_devices, ARRAY_SIZE(cm_bf548_devices)); #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |