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
/
parport
/
share.c
diff --git
a/drivers/parport/share.c
b/drivers/parport/share.c
index
bbbfd79
..
fd9129e
100644
(file)
--- a/
drivers/parport/share.c
+++ b/
drivers/parport/share.c
@@
-17,7
+17,6
@@
#undef PARPORT_DEBUG_SHARING /* undef for production */
#undef PARPORT_DEBUG_SHARING /* undef for production */
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/threads.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/threads.h>
@@
-218,7
+217,7
@@
static void free_port (struct parport *port)
* parport_get_port - increment a port's reference count
* @port: the port
*
* parport_get_port - increment a port's reference count
* @port: the port
*
- * This ensure
'
s that a struct parport pointer remains valid
+ * This ensures that a struct parport pointer remains valid
* until the matching parport_put_port() call.
**/
* until the matching parport_put_port() call.
**/
@@
-520,7
+519,7
@@
void parport_remove_port(struct parport *port)
struct pardevice *
parport_register_device(struct parport *port, const char *name,
int (*pf)(void *), void (*kf)(void *),
struct pardevice *
parport_register_device(struct parport *port, const char *name,
int (*pf)(void *), void (*kf)(void *),
- void (*irq_func)(int, void *
, struct pt_regs *
),
+ void (*irq_func)(int, void *),
int flags, void *handle)
{
struct pardevice *tmp;
int flags, void *handle)
{
struct pardevice *tmp;