diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-14 00:46:07 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-14 00:46:07 -0700 |
| commit | e91f24ae027a583f2faff84456fa2630144bfed8 (patch) | |
| tree | 3a9d13948a8313bd650d473efb1bb5f7a078d318 /drivers/hwmon/adcxx.c | |
| parent | 55689bfa21dc0c02ff6cc9c3ab90a78bc9b66093 (diff) | |
| parent | fd071b669ee2405e986636e389a3d1b6776e50a0 (diff) | |
Merge tag 'renesas-multiplatform-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
From Simon Horman:
Renesas ARM based SoC multiplatform updates for v3.12
Move Renesas ARM based SoCs a little closer to using
multiplatform by adding ARCH_SHMOBILE_MULTI and only
building clocks when COMMON_CLK=n.
* tag 'renesas-multiplatform-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Allow ARCH_SHMOBILE_MULTI timer configuration
ARM: shmobile: Add EMEV2 and KZM9D to ARCH_SHMOBILE_MULTI
ARM: shmobile: Introduce ARCH_SHMOBILE_MULTI
ARM: shmobile: Only build clocks when COMMON_CLK=n
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/hwmon/adcxx.c')
0 files changed, 0 insertions, 0 deletions