diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-05-23 18:49:25 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-05-23 21:58:10 +0200 |
| commit | 9f0f10117228b73ec657aab8f303c9ae88fda070 (patch) | |
| tree | 43bb4bb94bdf3d1ea2965282a66da8586c15405b /drivers/pwm/pwm-imx.c | |
| parent | a36d82e9d3c92f692c7ad68b72b4c1ea87905090 (diff) | |
| parent | 14f3791439b5a6cf12127fb80204265533d92664 (diff) | |
Merge tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/soc
Keystone SOC updates for 3.16
- Drop unused COMMON_CLK_DEBUG option
- Enable MTD_SPI_NOR config needed for M25P80
- Enable coherent higher address memory space
* tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
ARM: keystone: Update the dma offset for non-dt platform devices
ARM: keystone: Switch over to coherent memory address space
ARM: configs: keystone: add MTD_SPI_NOR (new dependency for M25P80)
ARM: configs: keystone: drop CONFIG_COMMON_CLK_DEBUG
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/pwm/pwm-imx.c')
0 files changed, 0 insertions, 0 deletions