diff options
author | Paul Mackerras <paulus@samba.org> | 2008-09-10 11:36:13 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-09-10 11:36:13 +1000 |
commit | 7e392f8c29ee045c6a29d50193d2fb10712eceb0 (patch) | |
tree | c84097fe644c50c82f087ab7fa2d75167b8c0e16 /kernel/utsname_sysctl.c | |
parent | 7713fef06517d216f96ee7c8ad750e72bc08d38f (diff) | |
parent | 93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95 (diff) | |
download | linux-7e392f8c29ee045c6a29d50193d2fb10712eceb0.tar.gz linux-7e392f8c29ee045c6a29d50193d2fb10712eceb0.tar.bz2 linux-7e392f8c29ee045c6a29d50193d2fb10712eceb0.zip |
Merge branch 'linux-2.6'
Diffstat (limited to 'kernel/utsname_sysctl.c')
-rw-r--r-- | kernel/utsname_sysctl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c index fe3a56c2256d..4ab9659d269e 100644 --- a/kernel/utsname_sysctl.c +++ b/kernel/utsname_sysctl.c @@ -12,7 +12,6 @@ #include <linux/module.h> #include <linux/uts.h> #include <linux/utsname.h> -#include <linux/version.h> #include <linux/sysctl.h> static void *get_uts(ctl_table *table, int write) |