diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 09:19:53 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 09:19:53 (GMT) |
commit | 064a32d82c20cdcb0119a8b316eb520608d8c647 (patch) | |
tree | c67d534bd4458b1482c11f11c724fe93beca4f80 /drivers/parisc/led.c | |
parent | 0327318445d55808991a63137cfb698a90ab6adf (diff) | |
parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
download | linux-fsl-qoriq-064a32d82c20cdcb0119a8b316eb520608d8c647.tar.xz |
Merge branch 'linus' into x86/memtest
Diffstat (limited to 'drivers/parisc/led.c')
-rw-r--r-- | drivers/parisc/led.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c index 703b85e..f9b1266 100644 --- a/drivers/parisc/led.c +++ b/drivers/parisc/led.c @@ -569,7 +569,7 @@ int __init register_led_driver(int model, unsigned long cmd_reg, unsigned long d default: printk(KERN_ERR "%s: Wrong LCD/LED model %d !\n", - __FUNCTION__, lcd_info.model); + __func__, lcd_info.model); return 1; } |