projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'kvm-for-lsk-v3.10-v1' of git://git.linaro.org/people/christoffer.dall...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
parport
/
ieee1284_ops.c
diff --git
a/drivers/parport/ieee1284_ops.c
b/drivers/parport/ieee1284_ops.c
index d6c77658231e9ae15ada522bbbcc66f7fde066ec..2e21af43d91ea26bcdfbe7ec3cc8354be086749c 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,