diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-03-12 11:01:07 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-03-12 11:01:07 -0400 |
| commit | ffb12cf002edbc5927079f51bebde428d601f723 (patch) | |
| tree | 1f04d80df9db8883037d59c81f5836770eecfdc6 /arch/arm/boot/dts/omap3-n9.dts | |
| parent | 1a75b8e64571a85d5e648cfdf4c40e0d9923abc5 (diff) | |
| parent | c1bacbae8192dd2a9ebadd22d793b68054f6c6e5 (diff) | |
Merge branch 'irq/for-gpio' into irq/core
Merge the request/release callbacks which are in a separate branch for
consumption by the gpio folks.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm/boot/dts/omap3-n9.dts')
| -rw-r--r-- | arch/arm/boot/dts/omap3-n9.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3-n9.dts b/arch/arm/boot/dts/omap3-n9.dts index 39828ce464ee..9938b5dc1909 100644 --- a/arch/arm/boot/dts/omap3-n9.dts +++ b/arch/arm/boot/dts/omap3-n9.dts | |||
| @@ -14,5 +14,5 @@ | |||
| 14 | 14 | ||
| 15 | / { | 15 | / { |
| 16 | model = "Nokia N9"; | 16 | model = "Nokia N9"; |
| 17 | compatible = "nokia,omap3-n9", "ti,omap3"; | 17 | compatible = "nokia,omap3-n9", "ti,omap36xx", "ti,omap3"; |
| 18 | }; | 18 | }; |