diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-02-27 17:33:51 +0100 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-02-27 17:33:51 +0100 |
commit | dbfedbb98145375106cee7ec7269611d553819dc (patch) | |
tree | 81d2a6de51b1bb3c704e5385dbc90ca79efa69bc /arch/i386/mach-default/Makefile | |
parent | Merge branch 'upstream-fixes' (diff) | |
parent | Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
download | linux-dbfedbb98145375106cee7ec7269611d553819dc.tar.xz linux-dbfedbb98145375106cee7ec7269611d553819dc.zip |
Merge branch 'master'
Diffstat (limited to 'arch/i386/mach-default/Makefile')
-rw-r--r-- | arch/i386/mach-default/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/mach-default/Makefile b/arch/i386/mach-default/Makefile index e95bb0237921..012fe34459e6 100644 --- a/arch/i386/mach-default/Makefile +++ b/arch/i386/mach-default/Makefile @@ -2,4 +2,4 @@ # Makefile for the linux kernel. # -obj-y := setup.o topology.o +obj-y := setup.o |