diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
| commit | 15dd859cacf312f606f54502d1f66537a1e5c78c (patch) | |
| tree | e50e125eaa6da83fa715704e53c1bde013d1ef8e /drivers/parport/procfs.c | |
| parent | b2d9d33412b9d13a40cd314d93ab517950fc5950 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge commit 'v2.6.27-rc1' into x86/core
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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, |