Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6816383a09b5be8d35f14f4c25dedb64498e4959

Authored by Paul Gortmaker
Committed by Greg Kroah-Hartman
1 parent 5a22e30def
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 9 changed files with 42 additions and 45 deletions Side-by-side Diff

... ... @@ -6187,8 +6187,8 @@
6187 6187 T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
6188 6188 T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
6189 6189 S: Maintained
  6190 +F: include/linux/sunserialcore.h
6190 6191 F: drivers/tty/serial/suncore.c
6191   -F: drivers/tty/serial/suncore.h
6192 6192 F: drivers/tty/serial/sunhv.c
6193 6193 F: drivers/tty/serial/sunsab.c
6194 6194 F: drivers/tty/serial/sunsab.h
drivers/tty/serial/8250/8250.c
Diff comments   View file @ 6816383
... ... @@ -38,15 +38,14 @@
38 38 #include <linux/nmi.h>
39 39 #include <linux/mutex.h>
40 40 #include <linux/slab.h>
  41 +#ifdef CONFIG_SPARC
  42 +#include <linux/sunserialcore.h>
  43 +#endif
41 44  
42 45 #include <asm/io.h>
43 46 #include <asm/irq.h>
44 47  
45 48 #include "8250.h"
46   -
47   -#ifdef CONFIG_SPARC
48   -#include "../suncore.h"
49   -#endif
50 49  
51 50 /*
52 51 * Configuration:
drivers/tty/serial/suncore.c
Diff comments   View file @ 6816383
... ... @@ -17,11 +17,11 @@
17 17 #include <linux/errno.h>
18 18 #include <linux/string.h>
19 19 #include <linux/serial_core.h>
  20 +#include <linux/sunserialcore.h>
20 21 #include <linux/init.h>
21 22  
22 23 #include <asm/prom.h>
23 24  
24   -#include "suncore.h"
25 25  
26 26 static int sunserial_current_minor = 64;
27 27  
drivers/tty/serial/suncore.h
View file @ 6816383
1   -/* suncore.h
2   - *
3   - * Generic SUN serial/kbd/ms layer. Based entirely
4   - * upon drivers/sbus/char/sunserial.h which is:
5   - *
6   - * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be)
7   - *
8   - * Port to new UART layer is:
9   - *
10   - * Copyright (C) 2002 David S. Miller (davem@redhat.com)
11   - */
12   -
13   -#ifndef _SERIAL_SUN_H
14   -#define _SERIAL_SUN_H
15   -
16   -/* Serial keyboard defines for L1-A processing... */
17   -#define SUNKBD_RESET 0xff
18   -#define SUNKBD_L1 0x01
19   -#define SUNKBD_UP 0x80
20   -#define SUNKBD_A 0x4d
21   -
22   -extern unsigned int suncore_mouse_baud_cflag_next(unsigned int, int *);
23   -extern int suncore_mouse_baud_detection(unsigned char, int);
24   -
25   -extern int sunserial_register_minors(struct uart_driver *, int);
26   -extern void sunserial_unregister_minors(struct uart_driver *, int);
27   -
28   -extern int sunserial_console_match(struct console *, struct device_node *,
29   - struct uart_driver *, int, bool);
30   -extern void sunserial_console_termios(struct console *,
31   - struct device_node *);
32   -
33   -#endif /* !(_SERIAL_SUN_H) */
drivers/tty/serial/sunhv.c
Diff comments   View file @ 6816383
... ... @@ -29,8 +29,7 @@
29 29 #endif
30 30  
31 31 #include <linux/serial_core.h>
32   -
33   -#include "suncore.h"
  32 +#include <linux/sunserialcore.h>
34 33  
35 34 #define CON_BREAK ((long)-1)
36 35 #define CON_HUP ((long)-2)
drivers/tty/serial/sunsab.c
Diff comments   View file @ 6816383
... ... @@ -43,8 +43,8 @@
43 43 #endif
44 44  
45 45 #include <linux/serial_core.h>
  46 +#include <linux/sunserialcore.h>
46 47  
47   -#include "suncore.h"
48 48 #include "sunsab.h"
49 49  
50 50 struct uart_sunsab_port {
drivers/tty/serial/sunsu.c
Diff comments   View file @ 6816383
... ... @@ -47,8 +47,7 @@
47 47 #endif
48 48  
49 49 #include <linux/serial_core.h>
50   -
51   -#include "suncore.h"
  50 +#include <linux/sunserialcore.h>
52 51  
53 52 /* We are on a NS PC87303 clocked with 24.0 MHz, which results
54 53 * in a UART clock of 1.8462 MHz.
drivers/tty/serial/sunzilog.c
Diff comments   View file @ 6816383
... ... @@ -43,8 +43,8 @@
43 43 #endif
44 44  
45 45 #include <linux/serial_core.h>
  46 +#include <linux/sunserialcore.h>
46 47  
47   -#include "suncore.h"
48 48 #include "sunzilog.h"
49 49  
50 50 /* On 32-bit sparcs we need to delay after register accesses
include/linux/sunserialcore.h
Diff comments   View file @ 6816383
  1 +/* sunserialcore.h
  2 + *
  3 + * Generic SUN serial/kbd/ms layer. Based entirely
  4 + * upon drivers/sbus/char/sunserial.h which is:
  5 + *
  6 + * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be)
  7 + *
  8 + * Port to new UART layer is:
  9 + *
  10 + * Copyright (C) 2002 David S. Miller (davem@redhat.com)
  11 + */
  12 +
  13 +#ifndef _SERIAL_SUN_H
  14 +#define _SERIAL_SUN_H
  15 +
  16 +/* Serial keyboard defines for L1-A processing... */
  17 +#define SUNKBD_RESET 0xff
  18 +#define SUNKBD_L1 0x01
  19 +#define SUNKBD_UP 0x80
  20 +#define SUNKBD_A 0x4d
  21 +
  22 +extern unsigned int suncore_mouse_baud_cflag_next(unsigned int, int *);
  23 +extern int suncore_mouse_baud_detection(unsigned char, int);
  24 +
  25 +extern int sunserial_register_minors(struct uart_driver *, int);
  26 +extern void sunserial_unregister_minors(struct uart_driver *, int);
  27 +
  28 +extern int sunserial_console_match(struct console *, struct device_node *,
  29 + struct uart_driver *, int, bool);
  30 +extern void sunserial_console_termios(struct console *,
  31 + struct device_node *);
  32 +
  33 +#endif /* !(_SERIAL_SUN_H) */