diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-10-27 12:32:29 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-27 12:32:29 +0000 |
commit | b99053eefce89c5c8500517f5f065c85b57d98ee (patch) | |
tree | 2e99059d55e32db39a2ada348c39f71bb473c0c1 /include/linux/vmstat.h | |
parent | 761e0ee0f0beecee7c2528588b043609b880de58 (diff) | |
parent | f8d56f1771e4867acc461146764b4feeb5245669 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c64xx
Conflicts:
arch/arm/mm/Kconfig
Diffstat (limited to 'include/linux/vmstat.h')
-rw-r--r-- | include/linux/vmstat.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h index 9cd3ab0f554..524cd1b28ec 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h @@ -54,10 +54,6 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, NR_VM_EVENT_ITEMS }; -extern const struct seq_operations fragmentation_op; -extern const struct seq_operations pagetypeinfo_op; -extern const struct seq_operations zoneinfo_op; -extern const struct seq_operations vmstat_op; extern int sysctl_stat_interval; #ifdef CONFIG_VM_EVENT_COUNTERS |