diff options
| author | Rob Herring <robh@kernel.org> | 2014-05-14 01:34:35 +0200 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-05-14 01:34:35 +0200 |
| commit | eafd370dfe487facfdef499057f4eac9aa0b4bf5 (patch) | |
| tree | 0925a67cd658cdf4811f49b4cd2073f663166bd0 /arch/arm/boot/dts/omap3-lilly-a83x.dtsi | |
| parent | of: push struct boot_param_header and defines into powerpc (diff) | |
| parent | of/selftest: add testcase for nodes with same name and address (diff) | |
| download | linux-eafd370dfe487facfdef499057f4eac9aa0b4bf5.tar.xz linux-eafd370dfe487facfdef499057f4eac9aa0b4bf5.zip | |
Merge branch 'dt-bus-name' into for-next
Diffstat (limited to 'arch/arm/boot/dts/omap3-lilly-a83x.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi index 6369d9f43ca2..cc1dce6978f5 100644 --- a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi +++ b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi @@ -368,7 +368,6 @@ /* no elm on omap3 */ gpmc,mux-add-data = <0>; - gpmc,device-nand; gpmc,device-width = <2>; gpmc,wait-pin = <0>; gpmc,wait-monitoring-ns = <0>; |