git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nfsd4: reshuffle lease-setting code to allow reuse
[safe/jmp/linux-2.6]
/
drivers
/
parport
/
ieee1284_ops.c
diff --git
a/drivers/parport/ieee1284_ops.c
b/drivers/parport/ieee1284_ops.c
index
d6c7765
..
2e21af4
100644
(file)
--- a/
drivers/parport/ieee1284_ops.c
+++ b/
drivers/parport/ieee1284_ops.c
@@
-14,7
+14,6
@@
*/
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/parport.h>
#include <linux/delay.h>
#include <linux/module.h>
#include <linux/parport.h>
#include <linux/delay.h>
@@
-889,7
+888,7
@@
size_t parport_ieee1284_epp_read_addr (struct parport *port,
/* Event 59: set nSelectIn (nAStrb) high */
parport_frob_control (port, PARPORT_CONTROL_SELECT,
/* Event 59: set nSelectIn (nAStrb) high */
parport_frob_control (port, PARPORT_CONTROL_SELECT,
-
PARPORT_CONTROL_SELECT
);
+
0
);
/* Event 60: wait for Busy to go low */
if (parport_poll_peripheral (port, PARPORT_STATUS_BUSY,
/* Event 60: wait for Busy to go low */
if (parport_poll_peripheral (port, PARPORT_STATUS_BUSY,