diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-05-14 22:31:23 (GMT) |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-05-14 22:31:23 (GMT) |
commit | 4de5167ee07f7a9b66d999e40f2c3193d1a08add (patch) | |
tree | 6458e3c033ace5f623046b92f90be9408db5deec /arch/arm/boot/dts/imx28.dtsi | |
parent | b9a5e5e18fbf223502c0b2264c15024e393da928 (diff) | |
parent | ff284f37fc0e6f3b51ede85c5944d571b640ac0f (diff) | |
download | linux-4de5167ee07f7a9b66d999e40f2c3193d1a08add.tar.xz |
Merge branches 'acpi-init' and 'acpica'
* acpi-init:
ACPI / init: Fix the ordering of acpi_reserve_resources()
* acpica:
Revert "ACPICA: Permanently set _REV to the value '2'."
Diffstat (limited to 'arch/arm/boot/dts/imx28.dtsi')
-rw-r--r-- | arch/arm/boot/dts/imx28.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index 25e25f8..4e073e8 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi @@ -913,7 +913,7 @@ 80 81 68 69 70 71 72 73 74 75 76 77>; - interrupt-names = "auart4-rx", "aurat4-tx", "spdif-tx", "empty", + interrupt-names = "auart4-rx", "auart4-tx", "spdif-tx", "empty", "saif0", "saif1", "i2c0", "i2c1", "auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx", "auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx"; |