git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
[sfrench/cifs-2.6.git]
/
arch
/
sh
/
kernel
/
cpu
/
irq
/
Makefile
diff --git
a/arch/sh/kernel/cpu/irq/Makefile
b/arch/sh/kernel/cpu/irq/Makefile
index e3cccea15e1d1dd670792f92314dc463efeb2f66..1c034c283f594aee3b73ac546909dfb173bfbd17 100644
(file)
--- a/
arch/sh/kernel/cpu/irq/Makefile
+++ b/
arch/sh/kernel/cpu/irq/Makefile
@@
-3,5
+3,6
@@
#
obj-y += ipr.o imask.o
-obj-$(CONFIG_CPU_HAS_PINT_IRQ) += pint.o
-obj-$(CONFIG_CPU_HAS_INTC2_IRQ) += intc2.o
+obj-$(CONFIG_CPU_HAS_PINT_IRQ) += pint.o
+obj-$(CONFIG_CPU_HAS_MASKREG_IRQ) += maskreg.o
+obj-$(CONFIG_CPU_HAS_INTC2_IRQ) += intc2.o