diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
| commit | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (patch) | |
| tree | 9a82f4b7f2c3afe4b0208d8e44ea61bae90a7d22 /arch/arm/plat-iop/pci.c | |
| parent | 5e226e4d9016daee170699f8a4188a5505021756 (diff) | |
| parent | bde4f8fa8db2abd5ac9c542d76012d0fedab050f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/plat-iop/pci.c')
| -rw-r--r-- | arch/arm/plat-iop/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-iop/pci.c b/arch/arm/plat-iop/pci.c index 2b5aa1135b11..98d01517b563 100644 --- a/arch/arm/plat-iop/pci.c +++ b/arch/arm/plat-iop/pci.c | |||
| @@ -371,7 +371,7 @@ static int __init iop3xx_init_atu_setup(char *str) | |||
| 371 | default: | 371 | default: |
| 372 | printk(KERN_DEBUG "\"%s\" malformed at " | 372 | printk(KERN_DEBUG "\"%s\" malformed at " |
| 373 | "character: \'%c\'", | 373 | "character: \'%c\'", |
| 374 | __FUNCTION__, | 374 | __func__, |
| 375 | *str); | 375 | *str); |
| 376 | *(str + 1) = '\0'; | 376 | *(str + 1) = '\0'; |
| 377 | } | 377 | } |