projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hpt366: clean up DMA timeout handling for HPT370
[powerpc.git]
/
drivers
/
parport
/
parport_sunbpp.c
diff --git
a/drivers/parport/parport_sunbpp.c
b/drivers/parport/parport_sunbpp.c
index
69a4bbd
..
9793533
100644
(file)
--- a/
drivers/parport/parport_sunbpp.c
+++ b/
drivers/parport/parport_sunbpp.c
@@
-46,9
+46,9
@@
#define dprintk(x)
#endif
#define dprintk(x)
#endif
-static irqreturn_t parport_sunbpp_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t parport_sunbpp_interrupt(int irq, void *dev_id)
{
{
- parport_generic_irq(irq, (struct parport *) dev_id
, regs
);
+ parport_generic_irq(irq, (struct parport *) dev_id);
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
@@
-322,7
+322,7
@@
static int __devinit init_one_port(struct sbus_dev *sdev)
p->size = size;
if ((err = request_irq(p->irq, parport_sunbpp_interrupt,
p->size = size;
if ((err = request_irq(p->irq, parport_sunbpp_interrupt,
-
SA_SHIRQ
, p->name, p)) != 0) {
+
IRQF_SHARED
, p->name, p)) != 0) {
goto out_put_port;
}
goto out_put_port;
}
@@
-389,7
+389,7
@@
static struct of_device_id bpp_match[] = {
{},
};
{},
};
-MODULE_DEVICE_TABLE(of,
qec_sbus
_match);
+MODULE_DEVICE_TABLE(of,
bpp
_match);
static struct of_platform_driver bpp_sbus_driver = {
.name = "bpp",
static struct of_platform_driver bpp_sbus_driver = {
.name = "bpp",