diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
| commit | 414f746d232d41ed6ae8632c4495ae795373c44b (patch) | |
| tree | 167f9bc8f139c6e82e6732b38c7a938b8a9d31cd /drivers/parport/procfs.c | |
| parent | 5a7a201c51c324876d00a54e7208af6af12d1ca4 (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'drivers/parport/procfs.c')
| -rw-r--r-- | drivers/parport/procfs.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c index d950fc34320a..554e11f9e1ce 100644 --- a/drivers/parport/procfs.c +++ b/drivers/parport/procfs.c | |||
| @@ -429,9 +429,6 @@ struct parport_default_sysctl_table | |||
| 429 | ctl_table dev_dir[2]; | 429 | ctl_table dev_dir[2]; |
| 430 | }; | 430 | }; |
| 431 | 431 | ||
| 432 | extern unsigned long parport_default_timeslice; | ||
| 433 | extern int parport_default_spintime; | ||
| 434 | |||
| 435 | static struct parport_default_sysctl_table | 432 | static struct parport_default_sysctl_table |
| 436 | parport_default_sysctl_table = { | 433 | parport_default_sysctl_table = { |
| 437 | .sysctl_header = NULL, | 434 | .sysctl_header = NULL, |