summaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/Makefile
diff options
context:
space:
mode:
authorSteven Whitehouse2006-09-13 15:55:09 +0200
committerSteven Whitehouse2006-09-13 15:55:09 +0200
commit0bc0748dfbefacce9c6b67ab23f2c80133b598f7 (patch)
tree76946adc08a26973fcdb39fe0eb3ef5e1f8f121d /arch/i386/kernel/Makefile
parent[GFS2] Use hlist for glock hash chains (diff)
parentLinux v2.6.18-rc7 (diff)
downloadkernel-qcow2-linux-0bc0748dfbefacce9c6b67ab23f2c80133b598f7.tar.gz
kernel-qcow2-linux-0bc0748dfbefacce9c6b67ab23f2c80133b598f7.tar.xz
kernel-qcow2-linux-0bc0748dfbefacce9c6b67ab23f2c80133b598f7.zip
Merge branch 'master' into gfs2
Diffstat (limited to 'arch/i386/kernel/Makefile')
-rw-r--r--arch/i386/kernel/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index ab98fc21a541..5427a842e841 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -39,7 +39,6 @@ obj-$(CONFIG_VM86) += vm86.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-$(CONFIG_HPET_TIMER) += hpet.o
obj-$(CONFIG_K8_NB) += k8.o
-obj-$(CONFIG_AUDIT) += audit.o
EXTRA_AFLAGS := -traditional