diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/x86/vdso/vdso32-setup.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/x86/vdso/vdso32-setup.c')
| -rw-r--r-- | arch/x86/vdso/vdso32-setup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c index 58bc00f68b1..02b442e9200 100644 --- a/arch/x86/vdso/vdso32-setup.c +++ b/arch/x86/vdso/vdso32-setup.c | |||
| @@ -393,7 +393,6 @@ static ctl_table abi_table2[] = { | |||
| 393 | 393 | ||
| 394 | static ctl_table abi_root_table2[] = { | 394 | static ctl_table abi_root_table2[] = { |
| 395 | { | 395 | { |
| 396 | .ctl_name = CTL_ABI, | ||
| 397 | .procname = "abi", | 396 | .procname = "abi", |
| 398 | .mode = 0555, | 397 | .mode = 0555, |
| 399 | .child = abi_table2 | 398 | .child = abi_table2 |