diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-07 08:32:01 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-07 08:32:01 +1000 |
| commit | afc6e5e89773413bb2df1fa9148b0f76706073aa (patch) | |
| tree | 4fe385062d80eb971ac4801eac727ea4cb475be2 /arch/arm/boot/dts/sun7i-a20-m3.dts | |
| parent | 75f873c5bd757fe3be49bbf1e25f984d26fd4a59 (diff) | |
| parent | 5675caea945d205c7abbac476300028f949eb5f2 (diff) | |
| download | linux-next-afc6e5e89773413bb2df1fa9148b0f76706073aa.tar.gz | |
Merge remote-tracking branch 'sunxi/sunxi/for-next'
Diffstat (limited to 'arch/arm/boot/dts/sun7i-a20-m3.dts')
| -rw-r--r-- | arch/arm/boot/dts/sun7i-a20-m3.dts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sun7i-a20-m3.dts b/arch/arm/boot/dts/sun7i-a20-m3.dts index 0e074bd0e8c9..86f69813683e 100644 --- a/arch/arm/boot/dts/sun7i-a20-m3.dts +++ b/arch/arm/boot/dts/sun7i-a20-m3.dts @@ -48,7 +48,6 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/interrupt-controller/irq.h> -#include <dt-bindings/pinctrl/sun4i-a10.h> / { model = "Mele M3"; |