diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-25 15:29:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-25 15:29:33 -0700 |
| commit | dd5957b78f9f17c3d4018dcff21dbae9a4486128 (patch) | |
| tree | c833cca7707288005906a7583c36112f7475637e /drivers/sh/Makefile | |
| parent | 497c01dda9a6abc969573ba999a86ed04a835e76 (diff) | |
| parent | 049d28048be595e0a10a58fe1c104b153c386633 (diff) | |
Merge tag 'renesas-sh-drivers-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas
Pull SH driver fix from Simon Horman:
"Confine SH_INTC to platforms that need it"
* tag 'renesas-sh-drivers-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
sh: intc: Confine SH_INTC to platforms that need it
Diffstat (limited to 'drivers/sh/Makefile')
| -rw-r--r-- | drivers/sh/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/sh/Makefile b/drivers/sh/Makefile index 788ed9b59b4e..114203f32843 100644 --- a/drivers/sh/Makefile +++ b/drivers/sh/Makefile @@ -1,8 +1,7 @@ # # Makefile for the SuperH specific drivers. # -obj-$(CONFIG_SUPERH) += intc/ -obj-$(CONFIG_ARCH_SHMOBILE_LEGACY) += intc/ +obj-$(CONFIG_SH_INTC) += intc/ ifneq ($(CONFIG_COMMON_CLK),y) obj-$(CONFIG_HAVE_CLK) += clk/ endif |