diff options
| author | Olof Johansson <olof@lixom.net> | 2013-07-12 11:06:01 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-07-12 11:06:01 -0700 |
| commit | 1b4fcb8558737d61bbccfcb0f73ea4fc988fa2ab (patch) | |
| tree | a19841db02799f36719fa330da02a05ee058c6d7 /arch/hexagon | |
| parent | 1157d73d07b6143cbe49145ef917d52abbe531f1 (diff) | |
| parent | cbe8933143a62e0ced2d48183cdbdbdc38659338 (diff) | |
Merge tag 'ux500-defconfig-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes
From Linus Walleij:
Ux500 defconfig changes:
- Update base due to different Kconfig changes
- Select watchdog, MUSB, Ux500 ALSA SoC, various MMC/SD
features and enable highmem
* tag 'ux500-defconfig-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: Enable HIGHMEM in the u8500 defconfig
ARM: ux500: Update MMC configs for u8500 defconfig
ARM: ux500: select SND_SOC_UX500 for ux500
ARM: ux500: update defconfig base
ARM: ux500: select WATCHDOG and MUSB for ux500
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/hexagon')
0 files changed, 0 insertions, 0 deletions