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>; };