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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
parport
/
ieee1284.c
diff --git
a/drivers/parport/ieee1284.c
b/drivers/parport/ieee1284.c
index
690b239
..
5accaa7
100644
(file)
--- a/
drivers/parport/ieee1284.c
+++ b/
drivers/parport/ieee1284.c
@@
-16,7
+16,6
@@
* Various hacks, Fred Barnes <frmb2@ukc.ac.uk>, 04/2000
*/
* Various hacks, Fred Barnes <frmb2@ukc.ac.uk>, 04/2000
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/threads.h>
#include <linux/parport.h>
#include <linux/module.h>
#include <linux/threads.h>
#include <linux/parport.h>
@@
-572,7
+571,7
@@
static int parport_ieee1284_ack_data_avail (struct parport *port)
#endif /* IEEE1284 support */
/* Handle an interrupt. */
#endif /* IEEE1284 support */
/* Handle an interrupt. */
-void parport_ieee1284_interrupt (int which, void *handle
, struct pt_regs *regs
)
+void parport_ieee1284_interrupt (int which, void *handle)
{
struct parport *port = handle;
parport_ieee1284_wakeup (port);
{
struct parport *port = handle;
parport_ieee1284_wakeup (port);