From 35379b1e99dae7ab1d6e21fa44174a1844fe19e7 Mon Sep 17 00:00:00 2001
From: Thierry Reding <thierry.reding@avionic-design.de>
Date: Wed, 19 Sep 2012 10:57:36 +0200
Subject: [PATCH] --- yaml --- r: 328468 b: refs/heads/master c:
 790b520e3accec16f3d93937ef6fb91d1fd30cf0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4abd23ad069a..a2cec5a6053d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e969a401a0126806cc2a358800b5b52d6c0a246
+refs/heads/master: 790b520e3accec16f3d93937ef6fb91d1fd30cf0
diff --git a/trunk/Documentation/devicetree/bindings/gpio/gpio-adnp.txt b/trunk/Documentation/devicetree/bindings/gpio/gpio-adnp.txt
index 5a09a216fe65..af66b2724837 100644
--- a/trunk/Documentation/devicetree/bindings/gpio/gpio-adnp.txt
+++ b/trunk/Documentation/devicetree/bindings/gpio/gpio-adnp.txt
@@ -11,6 +11,10 @@ Required properties:
 - gpio-controller: Marks the device as a GPIO controller
 - nr-gpios: The number of pins supported by the controller.
 
+The GPIO expander can optionally be used as an interrupt controller, in
+which case it uses the default two cell specifier as described in
+Documentation/devicetree/bindings/interrupt-controller/interrupts.txt.
+
 Example:
 
 	gpioext: gpio-controller@41 {