---

yaml --- r: 339504 b: refs/heads/master c: 95e629b h: refs/heads/master v: v3
git-mirror · Nov 16, 2012 · 3e04a21 · 3e04a21
1 parent 583416a
commit 3e04a21
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 85 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46000065a631c6d21452d533baf086175c384ba4
+refs/heads/master: 95e629b761ce36996d1befe2824d5346b5a220b9
diff --git a/trunk/arch/arm/include/asm/mach/serial_at91.h b/trunk/arch/arm/include/asm/mach/serial_at91.h
diff --git a/trunk/arch/avr32/include/asm/mach/serial_at91.h b/trunk/arch/avr32/include/asm/mach/serial_at91.h
diff --git a/trunk/drivers/tty/serial/atmel_serial.c b/trunk/drivers/tty/serial/atmel_serial.c
@@ -43,7 +43,6 @@
 #include <asm/io.h>
 #include <asm/ioctls.h>
 
-#include <asm/mach/serial_at91.h>
 #include <mach/board.h>
 
 #ifdef CONFIG_ARM
@@ -1513,23 +1512,6 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port,
 	}
 }
 
-/*
- * Register board-specific modem-control line handlers.
- */
-void __init atmel_register_uart_fns(struct atmel_port_fns *fns)
-{
-	if (fns->enable_ms)
-		atmel_pops.enable_ms = fns->enable_ms;
-	if (fns->get_mctrl)
-		atmel_pops.get_mctrl = fns->get_mctrl;
-	if (fns->set_mctrl)
-		atmel_pops.set_mctrl = fns->set_mctrl;
-	atmel_open_hook		= fns->open;
-	atmel_close_hook	= fns->close;
-	atmel_pops.pm		= fns->pm;
-	atmel_pops.set_wake	= fns->set_wake;
-}
-
 struct platform_device *atmel_default_console_device;	/* the serial console device */
 
 #ifdef CONFIG_SERIAL_ATMEL_CONSOLE