diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-12-10 09:59:21 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-12-10 09:59:21 -0800 |
| commit | 8e1c9f59442dd4fc80914c224dfd032ca2c284d2 (patch) | |
| tree | 69f03f96ca80c34ff251225e13390de5cbf71b24 /arch/arm/mach-at91/Makefile | |
| parent | c69bb7bd60fdbb96b57359c7bb0990a7531e0ed1 (diff) | |
| parent | 94c5216ee93b3b4170e7de1556ae6fffd2414c71 (diff) | |
| download | blackbird-obmc-linux-8e1c9f59442dd4fc80914c224dfd032ca2c284d2.tar.gz blackbird-obmc-linux-8e1c9f59442dd4fc80914c224dfd032ca2c284d2.zip | |
Merge branch 'next/cleanup' into next/dt
Diffstat (limited to 'arch/arm/mach-at91/Makefile')
| -rw-r--r-- | arch/arm/mach-at91/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 90aab2d5a07f..705b38a179ec 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -7,7 +7,7 @@ obj-m := obj-n := obj- := -obj-$(CONFIG_AT91_PMC_UNIT) += clock.o +obj-$(CONFIG_OLD_CLK_AT91) += clock.o obj-$(CONFIG_AT91_SAM9_ALT_RESET) += at91sam9_alt_reset.o obj-$(CONFIG_AT91_SAM9G45_RESET) += at91sam9g45_reset.o obj-$(CONFIG_AT91_SAM9_TIME) += at91sam926x_time.o |
