Commit 52a22f80 authored by Russell King's avatar Russell King

[SERIAL] Remove old pci_board cruft from serialP.h

parent 9700fe23
...@@ -22,10 +22,7 @@ ...@@ -22,10 +22,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/serial.h> #include <linux/serial.h>
/* 2.4.6 compatibility cruft - to be removed with the old serial.c code */
#define pci_board __pci_board
#include <linux/serialP.h> #include <linux/serialP.h>
#undef pci_board
#include <asm/bitops.h> #include <asm/bitops.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
......
...@@ -131,6 +131,9 @@ struct rs_multiport_struct { ...@@ -131,6 +131,9 @@ struct rs_multiport_struct {
* Digital did something really horribly wrong with the OUT1 and OUT2 * Digital did something really horribly wrong with the OUT1 and OUT2
* lines on at least some ALPHA's. The failure mode is that if either * lines on at least some ALPHA's. The failure mode is that if either
* is cleared, the machine locks up with endless interrupts. * is cleared, the machine locks up with endless interrupts.
*
* This is still used by arch/mips/au1000/common/serial.c for some weird
* reason (mips != alpha!)
*/ */
#define ALPHA_KLUDGE_MCR (UART_MCR_OUT2 | UART_MCR_OUT1) #define ALPHA_KLUDGE_MCR (UART_MCR_OUT2 | UART_MCR_OUT1)
#else #else
...@@ -138,29 +141,8 @@ struct rs_multiport_struct { ...@@ -138,29 +141,8 @@ struct rs_multiport_struct {
#endif #endif
/* /*
* Structures and definitions for PCI support * Definitions for PCI support.
*/ */
struct pci_dev;
struct pci_board {
int flags;
int num_ports;
int base_baud;
int uart_offset;
int reg_shift;
int (*init_fn)(struct pci_dev *dev, struct pci_board *board,
int enable);
int first_uart_offset;
};
struct pci_board_inst {
struct pci_board board;
struct pci_dev *dev;
};
#ifndef PCI_ANY_ID
#define PCI_ANY_ID (~0)
#endif
#define SPCI_FL_BASE_MASK 0x0007 #define SPCI_FL_BASE_MASK 0x0007
#define SPCI_FL_BASE0 0x0000 #define SPCI_FL_BASE0 0x0000
#define SPCI_FL_BASE1 0x0001 #define SPCI_FL_BASE1 0x0001
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment