diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
| commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch) | |
| tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /arch/mips/cobalt/Makefile | |
| parent | 3d29cdff999c37b3876082278a8134a0642a02cd (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
| download | blackbird-op-linux-bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775.tar.gz blackbird-op-linux-bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
Diffstat (limited to 'arch/mips/cobalt/Makefile')
| -rw-r--r-- | arch/mips/cobalt/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/cobalt/Makefile b/arch/mips/cobalt/Makefile index c35ee25e5578..9565b2104dcd 100644 --- a/arch/mips/cobalt/Makefile +++ b/arch/mips/cobalt/Makefile @@ -4,6 +4,6 @@ obj-y := irq.o reset.o setup.o buttons.o +obj-$(CONFIG_PCI) += pci.o obj-$(CONFIG_EARLY_PRINTK) += console.o - -EXTRA_AFLAGS := $(CFLAGS) +obj-$(CONFIG_MTD_PHYSMAP) += mtd.o |
