Merge commit 'v2.6.27' into timers/hpet

[linux-2.6-omap-h63xx.git] / include / linux / parport.h

diff --git a/include/linux/parport.h b/include/linux/parport.h
index dcb9e01a69ca9672879be141eb7d449b3297445b..6a0d7cdb577465a84bf5ccf3ef8ff0b86edc4002 100644 (file)
--- a/include/linux/parport.h
+++ b/include/linux/parport.h
@@ -560,5 +560,8 @@ extern int parport_device_proc_unregister(struct pardevice *device);
 
 #endif /*  !CONFIG_PARPORT_NOT_PC  */
 
+extern unsigned long parport_default_timeslice;
+extern int parport_default_spintime;
+
 #endif /* __KERNEL__ */
 #endif /* _PARPORT_H_ */