diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-12 02:32:56 +0300 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-12 02:33:20 +0300 |
| commit | b3f30fb41bd1387b6555ba4394c86a4cd1a6d635 (patch) | |
| tree | e96ba57c9dd83a2fd9ea0be8988ef242cde18064 /drivers/net/wireless/mwifiex/sta_event.c | |
| parent | 662cfed8a135ef980909bd5e33aaa3e43195acf1 (diff) | |
| parent | 4cbb08336f506cde30c0dfb3e49c55a52842fb5c (diff) | |
| download | linux-b3f30fb41bd1387b6555ba4394c86a4cd1a6d635.tar.xz | |
Merge tag 'omap-for-v4.2/o2_dc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/defconfig
Few omap2plus_defconfig changes for v4.2 merge window:
- Enable dm9000 as built-in for NFSroot
- Enable dm816x USB phy as a loadable module
- Enable Pixcir touch screen as a loadable module
* tag 'omap-for-v4.2/o2_dc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: omap2plus_defconfig: Enable TOUCHSCREEN_PIXCIR
ARM: omap2plus_defconfig: Add dm816x USB PHY as a loadable module
ARM: omap2plus_defconifg: Enable DM9000 in omap2plus_defconfig
Diffstat (limited to 'drivers/net/wireless/mwifiex/sta_event.c')
0 files changed, 0 insertions, 0 deletions