From 15d562fa48c77b25199a177bb059d6fd5581f2eb Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Thu, 19 Apr 2012 21:36:39 +0100
Subject: [PATCH] --- yaml --- r: 303209 b: refs/heads/master c:
 7919fb18cfcc9bc8c4751af4b26dada052483e98 h: refs/heads/master i:   303207:
 904aa97eb8c144f88d8920656e6f534b4d4208a4 v: v3

---
 [refs]                                                    | 2 +-
 trunk/Documentation/devicetree/bindings/gpio/gpio-nmk.txt | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1c531be56645..78bcbd4ae920 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f3ed40060ddef0c9fb6aef021a7937f8528f32c
+refs/heads/master: 7919fb18cfcc9bc8c4751af4b26dada052483e98
diff --git a/trunk/Documentation/devicetree/bindings/gpio/gpio-nmk.txt b/trunk/Documentation/devicetree/bindings/gpio/gpio-nmk.txt
index 3856789b52ea..ee87467ad8d6 100644
--- a/trunk/Documentation/devicetree/bindings/gpio/gpio-nmk.txt
+++ b/trunk/Documentation/devicetree/bindings/gpio/gpio-nmk.txt
@@ -13,6 +13,7 @@ Required properties:
                                   4 = active high level-sensitive.
                                   8 = active low level-sensitive.
 - gpio-controller       : Marks the device node as a GPIO controller.
+- interrupt-controller  : Marks the device node as an interrupt controller.
 - gpio-bank             : Specifies which bank a controller owns.
 - st,supports-sleepmode : Specifies whether controller can sleep or not
 
@@ -24,6 +25,7 @@ Example:
                         interrupts = <0 120 0x4>;
                         #gpio-cells = <2>;
                         gpio-controller;
+                        interrupt-controller;
                         supports-sleepmode;
                         gpio-bank = <1>;
                 };