git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gfs2
[pandora-kernel.git]
/
drivers
/
char
/
vme_scc.c
diff --git
a/drivers/char/vme_scc.c
b/drivers/char/vme_scc.c
index
fe99fc1
..
bfe5ea9
100644
(file)
--- a/
drivers/char/vme_scc.c
+++ b/
drivers/char/vme_scc.c
@@
-14,7
+14,6
@@
*/
#include <linux/module.h>
*/
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/kdev_t.h>
#include <asm/io.h>
#include <linux/kernel.h>
#include <linux/kdev_t.h>
#include <asm/io.h>
#include <linux/kernel.h>
@@
-204,13
+203,13
@@
static int mvme147_scc_init(void)
port->datap = port->ctrlp + 1;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
port->datap = port->ctrlp + 1;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
- request_irq(MVME147_IRQ_SCCA_TX, scc_tx_int,
SA_INTERRUPT
,
+ request_irq(MVME147_IRQ_SCCA_TX, scc_tx_int,
IRQF_DISABLED
,
"SCC-A TX", port);
"SCC-A TX", port);
- request_irq(MVME147_IRQ_SCCA_STAT, scc_stat_int,
SA_INTERRUPT
,
+ request_irq(MVME147_IRQ_SCCA_STAT, scc_stat_int,
IRQF_DISABLED
,
"SCC-A status", port);
"SCC-A status", port);
- request_irq(MVME147_IRQ_SCCA_RX, scc_rx_int,
SA_INTERRUPT
,
+ request_irq(MVME147_IRQ_SCCA_RX, scc_rx_int,
IRQF_DISABLED
,
"SCC-A RX", port);
"SCC-A RX", port);
- request_irq(MVME147_IRQ_SCCA_SPCOND, scc_spcond_int,
SA_INTERRUPT
,
+ request_irq(MVME147_IRQ_SCCA_SPCOND, scc_spcond_int,
IRQF_DISABLED
,
"SCC-A special cond", port);
{
SCC_ACCESS_INIT(port);
"SCC-A special cond", port);
{
SCC_ACCESS_INIT(port);
@@
-231,13
+230,13
@@
static int mvme147_scc_init(void)
port->datap = port->ctrlp + 1;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
port->datap = port->ctrlp + 1;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
- request_irq(MVME147_IRQ_SCCB_TX, scc_tx_int,
SA_INTERRUPT
,
+ request_irq(MVME147_IRQ_SCCB_TX, scc_tx_int,
IRQF_DISABLED
,
"SCC-B TX", port);
"SCC-B TX", port);
- request_irq(MVME147_IRQ_SCCB_STAT, scc_stat_int,
SA_INTERRUPT
,
+ request_irq(MVME147_IRQ_SCCB_STAT, scc_stat_int,
IRQF_DISABLED
,
"SCC-B status", port);
"SCC-B status", port);
- request_irq(MVME147_IRQ_SCCB_RX, scc_rx_int,
SA_INTERRUPT
,
+ request_irq(MVME147_IRQ_SCCB_RX, scc_rx_int,
IRQF_DISABLED
,
"SCC-B RX", port);
"SCC-B RX", port);
- request_irq(MVME147_IRQ_SCCB_SPCOND, scc_spcond_int,
SA_INTERRUPT
,
+ request_irq(MVME147_IRQ_SCCB_SPCOND, scc_spcond_int,
IRQF_DISABLED
,
"SCC-B special cond", port);
{
SCC_ACCESS_INIT(port);
"SCC-B special cond", port);
{
SCC_ACCESS_INIT(port);
@@
-274,13
+273,13
@@
static int mvme162_scc_init(void)
port->datap = port->ctrlp + 2;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
port->datap = port->ctrlp + 2;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
- request_irq(MVME162_IRQ_SCCA_TX, scc_tx_int,
SA_INTERRUPT
,
+ request_irq(MVME162_IRQ_SCCA_TX, scc_tx_int,
IRQF_DISABLED
,
"SCC-A TX", port);
"SCC-A TX", port);
- request_irq(MVME162_IRQ_SCCA_STAT, scc_stat_int,
SA_INTERRUPT
,
+ request_irq(MVME162_IRQ_SCCA_STAT, scc_stat_int,
IRQF_DISABLED
,
"SCC-A status", port);
"SCC-A status", port);
- request_irq(MVME162_IRQ_SCCA_RX, scc_rx_int,
SA_INTERRUPT
,
+ request_irq(MVME162_IRQ_SCCA_RX, scc_rx_int,
IRQF_DISABLED
,
"SCC-A RX", port);
"SCC-A RX", port);
- request_irq(MVME162_IRQ_SCCA_SPCOND, scc_spcond_int,
SA_INTERRUPT
,
+ request_irq(MVME162_IRQ_SCCA_SPCOND, scc_spcond_int,
IRQF_DISABLED
,
"SCC-A special cond", port);
{
SCC_ACCESS_INIT(port);
"SCC-A special cond", port);
{
SCC_ACCESS_INIT(port);
@@
-301,13
+300,13
@@
static int mvme162_scc_init(void)
port->datap = port->ctrlp + 2;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
port->datap = port->ctrlp + 2;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
- request_irq(MVME162_IRQ_SCCB_TX, scc_tx_int,
SA_INTERRUPT
,
+ request_irq(MVME162_IRQ_SCCB_TX, scc_tx_int,
IRQF_DISABLED
,
"SCC-B TX", port);
"SCC-B TX", port);
- request_irq(MVME162_IRQ_SCCB_STAT, scc_stat_int,
SA_INTERRUPT
,
+ request_irq(MVME162_IRQ_SCCB_STAT, scc_stat_int,
IRQF_DISABLED
,
"SCC-B status", port);
"SCC-B status", port);
- request_irq(MVME162_IRQ_SCCB_RX, scc_rx_int,
SA_INTERRUPT
,
+ request_irq(MVME162_IRQ_SCCB_RX, scc_rx_int,
IRQF_DISABLED
,
"SCC-B RX", port);
"SCC-B RX", port);
- request_irq(MVME162_IRQ_SCCB_SPCOND, scc_spcond_int,
SA_INTERRUPT
,
+ request_irq(MVME162_IRQ_SCCB_SPCOND, scc_spcond_int,
IRQF_DISABLED
,
"SCC-B special cond", port);
{
"SCC-B special cond", port);
{
@@
-342,13
+341,13
@@
static int bvme6000_scc_init(void)
port->datap = port->ctrlp + 4;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
port->datap = port->ctrlp + 4;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
- request_irq(BVME_IRQ_SCCA_TX, scc_tx_int,
SA_INTERRUPT
,
+ request_irq(BVME_IRQ_SCCA_TX, scc_tx_int,
IRQF_DISABLED
,
"SCC-A TX", port);
"SCC-A TX", port);
- request_irq(BVME_IRQ_SCCA_STAT, scc_stat_int,
SA_INTERRUPT
,
+ request_irq(BVME_IRQ_SCCA_STAT, scc_stat_int,
IRQF_DISABLED
,
"SCC-A status", port);
"SCC-A status", port);
- request_irq(BVME_IRQ_SCCA_RX, scc_rx_int,
SA_INTERRUPT
,
+ request_irq(BVME_IRQ_SCCA_RX, scc_rx_int,
IRQF_DISABLED
,
"SCC-A RX", port);
"SCC-A RX", port);
- request_irq(BVME_IRQ_SCCA_SPCOND, scc_spcond_int,
SA_INTERRUPT
,
+ request_irq(BVME_IRQ_SCCA_SPCOND, scc_spcond_int,
IRQF_DISABLED
,
"SCC-A special cond", port);
{
SCC_ACCESS_INIT(port);
"SCC-A special cond", port);
{
SCC_ACCESS_INIT(port);
@@
-369,13
+368,13
@@
static int bvme6000_scc_init(void)
port->datap = port->ctrlp + 4;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
port->datap = port->ctrlp + 4;
port->port_a = &scc_ports[0];
port->port_b = &scc_ports[1];
- request_irq(BVME_IRQ_SCCB_TX, scc_tx_int,
SA_INTERRUPT
,
+ request_irq(BVME_IRQ_SCCB_TX, scc_tx_int,
IRQF_DISABLED
,
"SCC-B TX", port);
"SCC-B TX", port);
- request_irq(BVME_IRQ_SCCB_STAT, scc_stat_int,
SA_INTERRUPT
,
+ request_irq(BVME_IRQ_SCCB_STAT, scc_stat_int,
IRQF_DISABLED
,
"SCC-B status", port);
"SCC-B status", port);
- request_irq(BVME_IRQ_SCCB_RX, scc_rx_int,
SA_INTERRUPT
,
+ request_irq(BVME_IRQ_SCCB_RX, scc_rx_int,
IRQF_DISABLED
,
"SCC-B RX", port);
"SCC-B RX", port);
- request_irq(BVME_IRQ_SCCB_SPCOND, scc_spcond_int,
SA_INTERRUPT
,
+ request_irq(BVME_IRQ_SCCB_SPCOND, scc_spcond_int,
IRQF_DISABLED
,
"SCC-B special cond", port);
{
"SCC-B special cond", port);
{