From: Ralf Baechle Date: Wed, 25 Jul 2012 14:37:46 +0000 (+0200) Subject: Merge branches 'next/generic', 'next/alchemy', 'next/bcm63xx', 'next/cavium', 'next... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=68d8848567ef03eb2c2303173934428d0bf0a531;p=linux-beck.git Merge branches 'next/generic', 'next/alchemy', 'next/bcm63xx', 'next/cavium', 'next/jz4740', 'next/lantiq', 'next/loongson1b' and 'next/netlogic' into mips-for-linux-next --- 68d8848567ef03eb2c2303173934428d0bf0a531 diff --cc arch/mips/netlogic/xlp/Makefile index b93ed83474ec,b93ed83474ec,b93ed83474ec,b93ed83474ec,9007ef0c398e,b93ed83474ec,b93ed83474ec,b93ed83474ec,5bd24b6a8f0b..6b4b972218f0 --- a/arch/mips/netlogic/xlp/Makefile +++ b/arch/mips/netlogic/xlp/Makefile @@@@@@@@@@ -1,2 -1,2 -1,2 -1,2 -1,3 -1,2 -1,2 -1,2 -1,3 +1,4 @@@@@@@@@@ obj-y += setup.o platform.o nlm_hal.o ++++ ++++obj-$(CONFIG_OF) += of.o obj-$(CONFIG_SMP) += wakeup.o ++++++++ obj-$(CONFIG_USB) += usb-init.o