diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-05-09 14:32:44 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-05-09 14:32:44 -0700 |
| commit | 65c98038394e65228490ef44353f5d4665690f55 (patch) | |
| tree | c7bd5afb40d455d995ec65bd9a6fb5d456e0bd45 /arch/arm/boot/dts/versatile-ab.dts | |
| parent | bfd17879866b36e95c58721da070d9f2ac7f8901 (diff) | |
| parent | b2f44dc29bfab77b10f3a709f14677f51ce3a4cd (diff) | |
| download | op-kernel-dev-65c98038394e65228490ef44353f5d4665690f55.zip op-kernel-dev-65c98038394e65228490ef44353f5d4665690f55.tar.gz | |
Merge branch 'fixes-non-critical' into cleanup-devices
Diffstat (limited to 'arch/arm/boot/dts/versatile-ab.dts')
| -rw-r--r-- | arch/arm/boot/dts/versatile-ab.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/versatile-ab.dts b/arch/arm/boot/dts/versatile-ab.dts index 0b32925..e2fe319 100644 --- a/arch/arm/boot/dts/versatile-ab.dts +++ b/arch/arm/boot/dts/versatile-ab.dts @@ -173,7 +173,7 @@ mmc@5000 { compatible = "arm,primecell"; reg = < 0x5000 0x1000>; - interrupts = <22>; + interrupts = <22 34>; }; kmi@6000 { compatible = "arm,pl050", "arm,primecell"; |
