From 1e52d4add7632f2cc9c30a5456a9d0952bbd7375 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@wwwdotorg.org>
Date: Fri, 16 Mar 2012 14:54:23 -0600
Subject: [PATCH] --- yaml --- r: 302326 b: refs/heads/master c:
 22f099d0fcb33073a1f1f10402a16b28602e20f2 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/include/linux/pinctrl/machine.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d05f82e00348..55c7e47136c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6974f1f458b083a84778641c6a4665799d6156da
+refs/heads/master: 22f099d0fcb33073a1f1f10402a16b28602e20f2
diff --git a/trunk/include/linux/pinctrl/machine.h b/trunk/include/linux/pinctrl/machine.h
index d32eb8ccba84..e4d1de742502 100644
--- a/trunk/include/linux/pinctrl/machine.h
+++ b/trunk/include/linux/pinctrl/machine.h
@@ -12,6 +12,8 @@
 #ifndef __LINUX_PINCTRL_MACHINE_H
 #define __LINUX_PINCTRL_MACHINE_H
 
+#include <linux/bug.h>
+
 #include "pinctrl-state.h"
 
 enum pinctrl_map_type {