diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-04-26 13:02:24 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-26 13:02:24 +0200 |
| commit | 8f8aab65459e46f3300f66335b6d001389883597 (patch) | |
| tree | d5fbf203e9cf63803a7fe3467ec39bdf81cfa279 /net | |
| parent | Merge tag 'samsung-defconfig64-4.7' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | arm64: Kconfig: select sp804 timer for ARCH_HISI (diff) | |
| download | linux-8f8aab65459e46f3300f66335b6d001389883597.tar.xz linux-8f8aab65459e46f3300f66335b6d001389883597.zip | |
Merge tag 'hi6220-config-for-4.7v3' of git://github.com/hisilicon/linux-hisi into next/arm64
Merge "ARM64: Hi6220: configure updates for 4.7 based on rc3" from Wei Xu:
- Enable Hi655x PMIC and regulator
- Enable SPI_SPIDEV as module
- Enable several common USB-Ethernet dongles
- Enable configs for WLAN and TI WL1835 as modules
- Enable ARM SP804 for ARCH_HISI
* tag 'hi6220-config-for-4.7v3' of git://github.com/hisilicon/linux-hisi:
arm64: Kconfig: select sp804 timer for ARCH_HISI
arm64: defconfig: enable configs for WLAN and TI WL1835 as modules
arm64: defconfig: enable several common USB network adapters
arm64: defconfig: add CONFIG_SPI_SPIDEV as module
arm64: defconfig: Enable the PMIC and regulator for Hi6220 and 96boards HiKey
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions