diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-02-27 17:49:05 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-02-27 17:49:05 +0100 |
| commit | cccc65a3b60edaf721cdee5a14f68ba009341822 (patch) | |
| tree | a458d28f70cbe0e848596aad6005442a2621d388 /arch/i386/mach-default/Makefile | |
| parent | [PATCH] libata: kill ata_dev_reread_id() (diff) | |
| parent | Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-cccc65a3b60edaf721cdee5a14f68ba009341822.tar.xz linux-cccc65a3b60edaf721cdee5a14f68ba009341822.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 |