diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 18:41:32 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 18:41:32 -0700 |
commit | 4833c16dea61cb30d6f77dfec3067a08ba79b361 (patch) | |
tree | fdf6cd3a851bca2c8c9db2e751abd5eddfcb2f66 /arch/blackfin/mach-common/Makefile | |
parent | e0e170bd7ded2ec16e2813d63c0faff43193fde8 (diff) | |
parent | ad3e01a331435a06055cdaf19cc973dd138dc925 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
Blackfin: fix inverted anomaly 05000481 logic
Blackfin: drop unused irq_panic()/DEBUG_ICACHE_CHECK
Blackfin: ppi/spi/twi headers: add missing __BFP undef
Blackfin: update defconfigs
Blackfin: bfin_twi.h: start a common TWI header
netdev: bfin_mac: push settings to platform resources
Diffstat (limited to 'arch/blackfin/mach-common/Makefile')
-rw-r--r-- | arch/blackfin/mach-common/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/blackfin/mach-common/Makefile b/arch/blackfin/mach-common/Makefile index 814cb483853b..ff299f24aba0 100644 --- a/arch/blackfin/mach-common/Makefile +++ b/arch/blackfin/mach-common/Makefile @@ -11,4 +11,3 @@ obj-$(CONFIG_CPU_FREQ) += cpufreq.o obj-$(CONFIG_CPU_VOLTAGE) += dpmc.o obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_BFIN_KERNEL_CLOCK) += clocks-init.o -obj-$(CONFIG_DEBUG_ICACHE_CHECK) += irqpanic.o |