diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-21 15:26:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-21 15:26:23 -0400 |
| commit | f6ce579d91029123e4b83137d7bf5bc487b7dfb9 (patch) | |
| tree | 7fe520396f9a926769a10868eeb9340494a17053 /drivers/Makefile | |
| parent | fba69f042ad99f68c0268ef1c012f3199f898fac (diff) | |
| parent | 3c90c55dcde745bed81f6447f24ba96bda43d984 (diff) | |
Merge tag 'renesas-sh-drivers-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas
Pull SH driver fix from Simon Horman:
"Compile drivers/sh/pm_runtime.c if ARCH_SHMOBILE_MULTI
This resolves a regression introduced in v3.14 by commit bf98c1eac1d4
("ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY")"
* tag 'renesas-sh-drivers-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
drivers: sh: compile drivers/sh/pm_runtime.c if ARCH_SHMOBILE_MULTI
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index d05d81b19b50..7183b6af5dac 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -119,7 +119,7 @@ obj-$(CONFIG_SGI_SN) += sn/ | |||
| 119 | obj-y += firmware/ | 119 | obj-y += firmware/ |
| 120 | obj-$(CONFIG_CRYPTO) += crypto/ | 120 | obj-$(CONFIG_CRYPTO) += crypto/ |
| 121 | obj-$(CONFIG_SUPERH) += sh/ | 121 | obj-$(CONFIG_SUPERH) += sh/ |
| 122 | obj-$(CONFIG_ARCH_SHMOBILE_LEGACY) += sh/ | 122 | obj-$(CONFIG_ARCH_SHMOBILE) += sh/ |
| 123 | ifndef CONFIG_ARCH_USES_GETTIMEOFFSET | 123 | ifndef CONFIG_ARCH_USES_GETTIMEOFFSET |
| 124 | obj-y += clocksource/ | 124 | obj-y += clocksource/ |
| 125 | endif | 125 | endif |