aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-09 22:09:42 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-09 22:09:42 -0500
commit701791cc3c8fc6dd83f6ec8af7e2541b4a316606 (patch)
tree3a8fce994dc9ca0fb5401f0d3aeb0ff8b9a2a821 /drivers/serial
parent4ba152596de23038e5bca413d23c3fe6fa92ff45 (diff)
parent96c612427edab65dddd88ad61d732501cc5f128d (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68knommu: export clk_* symbols in clk.c m68knommu: Split the .init section into INIT_TEXT_SECTION and INIT_DATA_SECTION. m68knommu: Move __init_end out of the .init section. m68knommu: Move __init_begin out of the .init section. m68knommu: Use more macros inside the .init section. m68knommu: Use INIT_TASK_DATA and CACHELINE_ALIGNED_DATA. m68knommu: Make THREAD_SIZE available to assembly files. m68knommu: Don't hardcode the value of PAGE_SIZE in the linker script. m68knommu: rename BSS define in linker script m68knommu: add a task_pt_regs() macro m68knommu: define arch_has_single_step() and friends m68knommu: add uboot commandline argument passing support m68knommu: Coldfire GPIO corrections m68knommu: move mcf_remove to .devexit.text Fixed up (?) conflict in arch/m68k/include/asm/ptrace.h
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/mcf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/mcf.c b/drivers/serial/mcf.c
index b44382442bf1..7bb5fee639e3 100644
--- a/drivers/serial/mcf.c
+++ b/drivers/serial/mcf.c
@@ -602,7 +602,7 @@ static int __devinit mcf_probe(struct platform_device *pdev)
602 602
603/****************************************************************************/ 603/****************************************************************************/
604 604
605static int mcf_remove(struct platform_device *pdev) 605static int __devexit mcf_remove(struct platform_device *pdev)
606{ 606{
607 struct uart_port *port; 607 struct uart_port *port;
608 int i; 608 int i;