diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-24 12:33:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-24 12:33:34 -0400 |
| commit | 346ad4b7fe392571f19314f153db9151dbc1d82b (patch) | |
| tree | 2d4085338c9044bca2f6472893da60387db3c96f /arch/blackfin/mach-bf561/boards/tepla.c | |
| parent | 845199f194306dbd69ca42d3b40a5125cdb50b89 (diff) | |
| parent | 2dc63a84b2db23b9680646aff93917211613bf1a (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (85 commits)
Blackfin char driver for Blackfin on-chip OTP memory (v3)
Blackfin Serial Driver: fix bug - use mod_timer to replace only add_timer.
Blackfin Serial Driver: the uart break anomaly has been given its own number, so switch to it
Blackfin Serial Driver: use BFIN_UART_NR_PORTS to help SIR driver in uart port.
Blackfin Serial Driver: Fix bug - kernel hangs when accessing uart 0 on bf537 when booting u-boot and linux on uart 1
Blackfin Serial Driver: punt unused lsr variable
Blackfin Serial Driver: Enable IR function when user application (irattach /dev/ttyBFx -s) call TIOCSETD ioctl with line discipline N_IRDA
[Blackfin] arch: add include/boot .gitignore files
[Blackfin] arch: Functional power management support: Add support for cpu frequency scaling
[Blackfin] arch: Functional power management support: Remove broken cpu frequency scaling drivers
[Blackfin] arch: Equalize include files: Add PLL_DIV Masks
[Blackfin] arch: Add a warning about the value of CLKIN.
[Blackfin] arch: take DDR DEVWD into consideration as well for BF548
[Blackfin] arch: Remove the circular buffering mechanism for exceptions
[Blackfin] arch: lose unnecessary dependency on CONFIG_BFIN_ICACHE for MPU
[Blackfin] arch: fix bug - before assign new channel to the map register, need clear the bits first.
[Blackfin] arch: add Blackfin on-chip SIR IrDA driver support
[Blackfin] arch: BF54x memsizes are in mbits, not mbytes
[Blackfin] arch: try to remove condition that causes double fault, by checking current before it gets dereferenced
[Blackfin] arch: Update anomaly list.
...
Diffstat (limited to 'arch/blackfin/mach-bf561/boards/tepla.c')
| -rw-r--r-- | arch/blackfin/mach-bf561/boards/tepla.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf561/boards/tepla.c b/arch/blackfin/mach-bf561/boards/tepla.c index ec6a2207c202..c9174b39f98d 100644 --- a/arch/blackfin/mach-bf561/boards/tepla.c +++ b/arch/blackfin/mach-bf561/boards/tepla.c | |||
| @@ -50,7 +50,7 @@ static struct platform_device *tepla_devices[] __initdata = { | |||
| 50 | 50 | ||
| 51 | static int __init tepla_init(void) | 51 | static int __init tepla_init(void) |
| 52 | { | 52 | { |
| 53 | printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); | 53 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
| 54 | return platform_add_devices(tepla_devices, ARRAY_SIZE(tepla_devices)); | 54 | return platform_add_devices(tepla_devices, ARRAY_SIZE(tepla_devices)); |
| 55 | } | 55 | } |
| 56 | 56 | ||