diff --git a/[refs] b/[refs] index 1fffadc52de9..c3686f74b0aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f165e4cf2af042af7d2440d688299c0d2a48b1f +refs/heads/master: 929dfb24fbcd60e2544b2de7bfb4a68da4dfc747 diff --git a/trunk/drivers/parport/procfs.c b/trunk/drivers/parport/procfs.c index d950fc34320a..554e11f9e1ce 100644 --- a/trunk/drivers/parport/procfs.c +++ b/trunk/drivers/parport/procfs.c @@ -429,9 +429,6 @@ struct parport_default_sysctl_table ctl_table dev_dir[2]; }; -extern unsigned long parport_default_timeslice; -extern int parport_default_spintime; - static struct parport_default_sysctl_table parport_default_sysctl_table = { .sysctl_header = NULL, diff --git a/trunk/include/linux/parport.h b/trunk/include/linux/parport.h index dcb9e01a69ca..6a0d7cdb5774 100644 --- a/trunk/include/linux/parport.h +++ b/trunk/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_ */