diff options
author | Paul Mackerras <paulus@samba.org> | 2008-03-26 00:44:18 +0300 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-03-26 00:44:18 +0300 |
commit | 54f53f2b94feb72622bec7a8563fc487d9f97720 (patch) | |
tree | ab0c4e1dcadd25a00fa7a4febf41bc43b864cf73 /arch/arm/mach-sa1100/cpu-sa1100.c | |
parent | f61fb8a52cdf8b9b6a6badde84aefe58cb35d315 (diff) | |
parent | a4083c9271e0a697278e089f2c0b9a95363ada0a (diff) | |
download | linux-54f53f2b94feb72622bec7a8563fc487d9f97720.tar.xz |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/arm/mach-sa1100/cpu-sa1100.c')
-rw-r--r-- | arch/arm/mach-sa1100/cpu-sa1100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/cpu-sa1100.c b/arch/arm/mach-sa1100/cpu-sa1100.c index d68630b74d78..343368aa82de 100644 --- a/arch/arm/mach-sa1100/cpu-sa1100.c +++ b/arch/arm/mach-sa1100/cpu-sa1100.c @@ -139,7 +139,7 @@ static void sa1100_update_dram_timings(int current_speed, int new_speed) if (settings->speed == 0) { panic("%s: couldn't find dram setting for speed %d\n", - __FUNCTION__, new_speed); + __func__, new_speed); } /* No risk, no fun: run with interrupts on! */ |