diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 14:05:59 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 14:05:59 -0400 |
| commit | 0f8b1a0204a12441cddbbf5be31e6338e0b8da1c (patch) | |
| tree | 7a546266d24908269049bde5cb40aade4b45b06a /arch/arm/boot/dts/tegra30.dtsi | |
| parent | 928c0c1571b004917a989c4d92b09ac129ad68b2 (diff) | |
| parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
Merge v3.9-rc5 into driver-core-next
We want the fixes in here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/tegra30.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/tegra30.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index 9d87a3ffe998..dbf46c272562 100644 --- a/arch/arm/boot/dts/tegra30.dtsi +++ b/arch/arm/boot/dts/tegra30.dtsi | |||
| @@ -372,7 +372,7 @@ | |||
| 372 | 372 | ||
| 373 | spi@7000d800 { | 373 | spi@7000d800 { |
| 374 | compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink"; | 374 | compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink"; |
| 375 | reg = <0x7000d480 0x200>; | 375 | reg = <0x7000d800 0x200>; |
| 376 | interrupts = <0 83 0x04>; | 376 | interrupts = <0 83 0x04>; |
| 377 | nvidia,dma-request-selector = <&apbdma 17>; | 377 | nvidia,dma-request-selector = <&apbdma 17>; |
| 378 | #address-cells = <1>; | 378 | #address-cells = <1>; |