diff options
| author | Olof Johansson <olof@lixom.net> | 2015-04-03 17:49:52 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-04-03 17:49:52 -0400 |
| commit | 9d8633915ba52158d53b016d276ca30616a6e6b3 (patch) | |
| tree | 4e1d1e4f627563c594cd5c69e8424db94f4cb1f3 /drivers/soc/mediatek/Makefile | |
| parent | 47f36e4921ae11dccf3163f75f70bb55686780f1 (diff) | |
| parent | 1f022d84bd193ec88b01c6d2cb5b6647cb20a02f (diff) | |
Merge tag 'v4.0-next-soc' of https://github.com/mbgg/linux-mediatek into next/drivers
Merge "ARM: mediatek: soc updates for v4.1" from Matthias Brugger:
- enable the pin controller in Kconfig
- Add PMIC wrapper for MT8135 and MT8173 SoCs
* tag 'v4.0-next-soc' of https://github.com/mbgg/linux-mediatek:
soc: mediatek: Add PMIC wrapper for MT8135 and MT8173 SoCs
ARM: mediatek: enable the pin controller
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/soc/mediatek/Makefile')
| -rw-r--r-- | drivers/soc/mediatek/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/soc/mediatek/Makefile b/drivers/soc/mediatek/Makefile new file mode 100644 index 000000000000..ecaf4defd7f6 --- /dev/null +++ b/drivers/soc/mediatek/Makefile | |||
| @@ -0,0 +1 @@ | |||
| obj-$(CONFIG_MTK_PMIC_WRAP) += mtk-pmic-wrap.o | |||