diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-26 18:04:59 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-26 18:04:59 -0400 |
| commit | d9ecdb282c91952796b7542c4f57fd6de6948d7b (patch) | |
| tree | fd4de7923968afa7d2981fb037e2255fc2cfa1e1 /include/linux/parport.h | |
| parent | 4ef584ba84125b67c17b5aded38e7783cd8cdef0 (diff) | |
| parent | 1d1f8b377c48e5aeddaea52eba74cc0539f088cd (diff) | |
Merge branch 'for_rmk_13' of git://git.mnementh.co.uk/linux-2.6-im
Diffstat (limited to 'include/linux/parport.h')
| -rw-r--r-- | include/linux/parport.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/parport.h b/include/linux/parport.h index dcb9e01a69ca..6a0d7cdb5774 100644 --- a/include/linux/parport.h +++ b/include/linux/parport.h | |||
| @@ -560,5 +560,8 @@ extern int parport_device_proc_unregister(struct pardevice *device); | |||
| 560 | 560 | ||
| 561 | #endif /* !CONFIG_PARPORT_NOT_PC */ | 561 | #endif /* !CONFIG_PARPORT_NOT_PC */ |
| 562 | 562 | ||
| 563 | extern unsigned long parport_default_timeslice; | ||
| 564 | extern int parport_default_spintime; | ||
| 565 | |||
| 563 | #endif /* __KERNEL__ */ | 566 | #endif /* __KERNEL__ */ |
| 564 | #endif /* _PARPORT_H_ */ | 567 | #endif /* _PARPORT_H_ */ |