git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
pcmcia
/
m32r_cfc.c
diff --git
a/drivers/pcmcia/m32r_cfc.c
b/drivers/pcmcia/m32r_cfc.c
index
071cf48
..
3c22ac4
100644
(file)
--- a/
drivers/pcmcia/m32r_cfc.c
+++ b/
drivers/pcmcia/m32r_cfc.c
@@
-10,7
+10,6
@@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/init.h>
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/fcntl.h>
#include <linux/string.h>
#include <linux/types.h>
#include <linux/fcntl.h>
#include <linux/string.h>
@@
-255,7
+254,7
@@
static pcc_t pcc[] = {
#endif /* CONFIG_PLAT_USRV */
};
#endif /* CONFIG_PLAT_USRV */
};
-static irqreturn_t pcc_interrupt(int, void *
, struct pt_regs *
);
+static irqreturn_t pcc_interrupt(int, void *);
/*====================================================================*/
/*====================================================================*/
@@
-373,14
+372,13
@@
static void add_pcc_socket(ulong base, int irq, ulong mapaddr, kio_addr_t ioaddr
/*====================================================================*/
/*====================================================================*/
-static irqreturn_t pcc_interrupt(int irq, void *dev
, struct pt_regs *regs
)
+static irqreturn_t pcc_interrupt(int irq, void *dev)
{
int i;
u_int events = 0;
int handled = 0;
{
int i;
u_int events = 0;
int handled = 0;
- debug(3, "m32r_cfc: pcc_interrupt: irq=%d, dev=%p, regs=%p\n",
- irq, dev, regs);
+ debug(3, "m32r_cfc: pcc_interrupt: irq=%d, dev=%p\n", irq, dev);
for (i = 0; i < pcc_sockets; i++) {
if (socket[i].cs_irq1 != irq && socket[i].cs_irq2 != irq)
continue;
for (i = 0; i < pcc_sockets; i++) {
if (socket[i].cs_irq1 != irq && socket[i].cs_irq2 != irq)
continue;
@@
-400,7
+398,7
@@
static irqreturn_t pcc_interrupt(int irq, void *dev, struct pt_regs *regs)
static void pcc_interrupt_wrapper(u_long data)
{
debug(3, "m32r_cfc: pcc_interrupt_wrapper:\n");
static void pcc_interrupt_wrapper(u_long data)
{
debug(3, "m32r_cfc: pcc_interrupt_wrapper:\n");
- pcc_interrupt(0, NULL
, NULL
);
+ pcc_interrupt(0, NULL);
init_timer(&poll_timer);
poll_timer.expires = jiffies + poll_interval;
add_timer(&poll_timer);
init_timer(&poll_timer);
poll_timer.expires = jiffies + poll_interval;
add_timer(&poll_timer);