| From 7242a5c3b6dae31b7d9fc687ece21d96aa27bead Mon Sep 17 00:00:00 2001 |
| From: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Date: Thu, 9 Feb 2012 18:48:19 -0500 |
| Subject: tty: sparc: rename drivers/tty/serial/suncore.h -> |
| include/linux/sunserialcore.h |
| |
| There are multiple users of this file from different source |
| paths now, and rather than have ../ paths in include statements, |
| just move the file to the linux header dir. |
| |
| Suggested-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Acked-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| (cherry picked from commit 6816383a09b5be8d35f14f4c25dedb64498e4959) |
| |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| --- |
| MAINTAINERS | 2 +- |
| drivers/tty/serial/8250/8250.c | 7 +++---- |
| drivers/tty/serial/suncore.c | 2 +- |
| drivers/tty/serial/suncore.h | 33 --------------------------------- |
| drivers/tty/serial/sunhv.c | 3 +-- |
| drivers/tty/serial/sunsab.c | 2 +- |
| drivers/tty/serial/sunsu.c | 3 +-- |
| drivers/tty/serial/sunzilog.c | 2 +- |
| include/linux/sunserialcore.h | 33 +++++++++++++++++++++++++++++++++ |
| 9 files changed, 42 insertions(+), 45 deletions(-) |
| rename drivers/tty/serial/suncore.h => include/linux/sunserialcore.h (98%) |
| |
| --- a/MAINTAINERS |
| +++ b/MAINTAINERS |
| @@ -5958,8 +5958,8 @@ L: sparclinux@vger.kernel.org |
| T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git |
| T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git |
| S: Maintained |
| +F: include/linux/sunserialcore.h |
| F: drivers/tty/serial/suncore.c |
| -F: drivers/tty/serial/suncore.h |
| F: drivers/tty/serial/sunhv.c |
| F: drivers/tty/serial/sunsab.c |
| F: drivers/tty/serial/sunsab.h |
| --- a/drivers/tty/serial/8250/8250.c |
| +++ b/drivers/tty/serial/8250/8250.c |
| @@ -38,16 +38,15 @@ |
| #include <linux/nmi.h> |
| #include <linux/mutex.h> |
| #include <linux/slab.h> |
| +#ifdef CONFIG_SPARC |
| +#include <linux/sunserialcore.h> |
| +#endif |
| |
| #include <asm/io.h> |
| #include <asm/irq.h> |
| |
| #include "8250.h" |
| |
| -#ifdef CONFIG_SPARC |
| -#include "../suncore.h" |
| -#endif |
| - |
| /* |
| * Configuration: |
| * share_irqs - whether we pass IRQF_SHARED to request_irq(). This option |
| --- a/drivers/tty/serial/suncore.c |
| +++ b/drivers/tty/serial/suncore.c |
| @@ -17,11 +17,11 @@ |
| #include <linux/errno.h> |
| #include <linux/string.h> |
| #include <linux/serial_core.h> |
| +#include <linux/sunserialcore.h> |
| #include <linux/init.h> |
| |
| #include <asm/prom.h> |
| |
| -#include "suncore.h" |
| |
| static int sunserial_current_minor = 64; |
| |
| --- a/drivers/tty/serial/suncore.h |
| +++ /dev/null |
| @@ -1,33 +0,0 @@ |
| -/* suncore.h |
| - * |
| - * Generic SUN serial/kbd/ms layer. Based entirely |
| - * upon drivers/sbus/char/sunserial.h which is: |
| - * |
| - * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) |
| - * |
| - * Port to new UART layer is: |
| - * |
| - * Copyright (C) 2002 David S. Miller (davem@redhat.com) |
| - */ |
| - |
| -#ifndef _SERIAL_SUN_H |
| -#define _SERIAL_SUN_H |
| - |
| -/* Serial keyboard defines for L1-A processing... */ |
| -#define SUNKBD_RESET 0xff |
| -#define SUNKBD_L1 0x01 |
| -#define SUNKBD_UP 0x80 |
| -#define SUNKBD_A 0x4d |
| - |
| -extern unsigned int suncore_mouse_baud_cflag_next(unsigned int, int *); |
| -extern int suncore_mouse_baud_detection(unsigned char, int); |
| - |
| -extern int sunserial_register_minors(struct uart_driver *, int); |
| -extern void sunserial_unregister_minors(struct uart_driver *, int); |
| - |
| -extern int sunserial_console_match(struct console *, struct device_node *, |
| - struct uart_driver *, int, bool); |
| -extern void sunserial_console_termios(struct console *, |
| - struct device_node *); |
| - |
| -#endif /* !(_SERIAL_SUN_H) */ |
| --- a/drivers/tty/serial/sunhv.c |
| +++ b/drivers/tty/serial/sunhv.c |
| @@ -29,8 +29,7 @@ |
| #endif |
| |
| #include <linux/serial_core.h> |
| - |
| -#include "suncore.h" |
| +#include <linux/sunserialcore.h> |
| |
| #define CON_BREAK ((long)-1) |
| #define CON_HUP ((long)-2) |
| --- a/drivers/tty/serial/sunsab.c |
| +++ b/drivers/tty/serial/sunsab.c |
| @@ -43,8 +43,8 @@ |
| #endif |
| |
| #include <linux/serial_core.h> |
| +#include <linux/sunserialcore.h> |
| |
| -#include "suncore.h" |
| #include "sunsab.h" |
| |
| struct uart_sunsab_port { |
| --- a/drivers/tty/serial/sunsu.c |
| +++ b/drivers/tty/serial/sunsu.c |
| @@ -47,8 +47,7 @@ |
| #endif |
| |
| #include <linux/serial_core.h> |
| - |
| -#include "suncore.h" |
| +#include <linux/sunserialcore.h> |
| |
| /* We are on a NS PC87303 clocked with 24.0 MHz, which results |
| * in a UART clock of 1.8462 MHz. |
| --- a/drivers/tty/serial/sunzilog.c |
| +++ b/drivers/tty/serial/sunzilog.c |
| @@ -43,8 +43,8 @@ |
| #endif |
| |
| #include <linux/serial_core.h> |
| +#include <linux/sunserialcore.h> |
| |
| -#include "suncore.h" |
| #include "sunzilog.h" |
| |
| /* On 32-bit sparcs we need to delay after register accesses |
| --- /dev/null |
| +++ b/include/linux/sunserialcore.h |
| @@ -0,0 +1,33 @@ |
| +/* sunserialcore.h |
| + * |
| + * Generic SUN serial/kbd/ms layer. Based entirely |
| + * upon drivers/sbus/char/sunserial.h which is: |
| + * |
| + * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) |
| + * |
| + * Port to new UART layer is: |
| + * |
| + * Copyright (C) 2002 David S. Miller (davem@redhat.com) |
| + */ |
| + |
| +#ifndef _SERIAL_SUN_H |
| +#define _SERIAL_SUN_H |
| + |
| +/* Serial keyboard defines for L1-A processing... */ |
| +#define SUNKBD_RESET 0xff |
| +#define SUNKBD_L1 0x01 |
| +#define SUNKBD_UP 0x80 |
| +#define SUNKBD_A 0x4d |
| + |
| +extern unsigned int suncore_mouse_baud_cflag_next(unsigned int, int *); |
| +extern int suncore_mouse_baud_detection(unsigned char, int); |
| + |
| +extern int sunserial_register_minors(struct uart_driver *, int); |
| +extern void sunserial_unregister_minors(struct uart_driver *, int); |
| + |
| +extern int sunserial_console_match(struct console *, struct device_node *, |
| + struct uart_driver *, int, bool); |
| +extern void sunserial_console_termios(struct console *, |
| + struct device_node *); |
| + |
| +#endif /* !(_SERIAL_SUN_H) */ |