diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-12-09 14:36:59 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-12-09 14:36:59 +1100 |
| commit | 56d8adc5695a8d3f070c8498d532389580af5611 (patch) | |
| tree | bbcb6c38506af002e94e64df8ab1540e6aba7825 /arch/powerpc/sysdev/Makefile | |
| parent | f4b98415953dcf85bac4ea0a2264a3ead4a7bcc4 (diff) | |
| parent | ee2ffd8bbb2170f9b52fc8ff4aebe9702e0de651 (diff) | |
| download | linux-56d8adc5695a8d3f070c8498d532389580af5611.tar.gz linux-56d8adc5695a8d3f070c8498d532389580af5611.tar.bz2 linux-56d8adc5695a8d3f070c8498d532389580af5611.zip | |
Merge remote branch 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/sysdev/Makefile')
| -rw-r--r-- | arch/powerpc/sysdev/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile index 0bef9dacb64e..9c2973479142 100644 --- a/arch/powerpc/sysdev/Makefile +++ b/arch/powerpc/sysdev/Makefile @@ -41,6 +41,7 @@ obj-$(CONFIG_OF_RTC) += of_rtc.o ifeq ($(CONFIG_PCI),y) obj-$(CONFIG_4xx) += ppc4xx_pci.o endif +obj-$(CONFIG_PPC4xx_CPM) += ppc4xx_cpm.o obj-$(CONFIG_PPC4xx_GPIO) += ppc4xx_gpio.o obj-$(CONFIG_CPM) += cpm_common.o |