diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 17:04:39 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 17:04:39 +0100 |
| commit | b472b8e22f9f9bc88dc73017d61609684289fb13 (patch) | |
| tree | cbb2ec0c2fd2cf6d9f4d2e323e97aa757bd93c59 /arch/arm/boot/dts/imx23.dtsi | |
| parent | USB: isp1760-if: Change to use irq_of_parse_and_map (diff) | |
| parent | Linux 3.7-rc3 (diff) | |
| download | linux-b472b8e22f9f9bc88dc73017d61609684289fb13.tar.xz linux-b472b8e22f9f9bc88dc73017d61609684289fb13.zip | |
Merge 3.7-rc3 into usb-next.
This pulls in all of the USB changes in 3.7-rc3 into usb-next and
resolves the merge issue with:
drivers/usb/misc/ezusb.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/imx23.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx23.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi index 9ca4ca70c1bc..6d31aa383460 100644 --- a/arch/arm/boot/dts/imx23.dtsi +++ b/arch/arm/boot/dts/imx23.dtsi @@ -69,6 +69,7 @@ interrupts = <13>, <56>; interrupt-names = "gpmi-dma", "bch"; clocks = <&clks 34>; + clock-names = "gpmi_io"; fsl,gpmi-dma-channel = <4>; status = "disabled"; }; |