Skip to content

Commit

Permalink
tty: sparc: rename drivers/tty/serial/suncore.h -> include/linux/suns…
Browse files Browse the repository at this point in the history
…erialcore.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>
  • Loading branch information
Paul Gortmaker authored and Greg Kroah-Hartman committed Feb 10, 2012
1 parent 5a22e30 commit 6816383
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 13 deletions.
2 changes: 1 addition & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -6187,8 +6187,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
Expand Down
7 changes: 3 additions & 4 deletions drivers/tty/serial/8250/8250.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/suncore.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 1 addition & 2 deletions drivers/tty/serial/sunhv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/sunsab.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
#endif

#include <linux/serial_core.h>
#include <linux/sunserialcore.h>

#include "suncore.h"
#include "sunsab.h"

struct uart_sunsab_port {
Expand Down
3 changes: 1 addition & 2 deletions drivers/tty/serial/sunsu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion drivers/tty/serial/sunzilog.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* suncore.h
/* sunserialcore.h
*
* Generic SUN serial/kbd/ms layer. Based entirely
* upon drivers/sbus/char/sunserial.h which is:
Expand Down

0 comments on commit 6816383

Please sign in to comment.