diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-03-16 18:09:48 +0100 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-03-16 18:09:48 +0100 |
| commit | 88c5544ab2240cf2a2dc87b5af9cd7990d06d028 (patch) | |
| tree | 7474b7d520d4a0604bc9879c7e4e183b9509ff04 /arch/arm/mach-at91/Makefile | |
| parent | 2197cf7006b645893dbccaef454815fb6d7b3fda (diff) | |
| parent | 8590ca655a19f9e124b52bfbf28f14eb16a05bec (diff) | |
| download | op-kernel-dev-88c5544ab2240cf2a2dc87b5af9cd7990d06d028.zip op-kernel-dev-88c5544ab2240cf2a2dc87b5af9cd7990d06d028.tar.gz | |
Merge tag 'at91-cleanup3' into at91-4.1-multiplatform
Third batch of cleanup for 4.1:
- System Timer (ST) for at91rm9200 re-work (syscon/regmap):
- watchdog
- restart handler
- timer as a proper clocksource
=> remove mach dependency + cleanup
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 ea54c98..38aaef7 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -7,7 +7,7 @@ obj-y := soc.o obj-$(CONFIG_SOC_AT91SAM9) += sam9_smc.o # CPU-specific support -obj-$(CONFIG_SOC_AT91RM9200) += at91rm9200.o at91rm9200_time.o +obj-$(CONFIG_SOC_AT91RM9200) += at91rm9200.o obj-$(CONFIG_SOC_AT91SAM9) += at91sam9.o obj-$(CONFIG_SOC_SAMA5) += sama5.o |
