From 15787e9fc080d3478e95e3b0afa6247f2e1f7111 Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Tue, 6 Mar 2012 21:15:51 +0100
Subject: [PATCH] --- yaml --- r: 294096 b: refs/heads/master c:
 9a01be1715b6a027765701ca09ba0401ff066fc5 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/include/linux/pinctrl/consumer.h      | 2 +-
 trunk/include/linux/pinctrl/machine.h       | 2 +-
 trunk/include/linux/pinctrl/pinctrl-state.h | 6 ++++++
 trunk/include/linux/pinctrl/pinctrl.h       | 3 +--
 5 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 trunk/include/linux/pinctrl/pinctrl-state.h

diff --git a/[refs] b/[refs]
index cad8261f59be..8c01d3cefa46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 872acc322c74bb06b7ceb61fe93314e2da32362c
+refs/heads/master: 9a01be1715b6a027765701ca09ba0401ff066fc5
diff --git a/trunk/include/linux/pinctrl/consumer.h b/trunk/include/linux/pinctrl/consumer.h
index 9ad5896cfa0e..191e72688481 100644
--- a/trunk/include/linux/pinctrl/consumer.h
+++ b/trunk/include/linux/pinctrl/consumer.h
@@ -15,7 +15,7 @@
 #include <linux/err.h>
 #include <linux/list.h>
 #include <linux/seq_file.h>
-#include "pinctrl.h"
+#include "pinctrl-state.h"
 
 /* This struct is private to the core and should be regarded as a cookie */
 struct pinctrl;
diff --git a/trunk/include/linux/pinctrl/machine.h b/trunk/include/linux/pinctrl/machine.h
index 3fd2f9dfc645..fee4349364f7 100644
--- a/trunk/include/linux/pinctrl/machine.h
+++ b/trunk/include/linux/pinctrl/machine.h
@@ -12,7 +12,7 @@
 #ifndef __LINUX_PINCTRL_MACHINE_H
 #define __LINUX_PINCTRL_MACHINE_H
 
-#include "pinctrl.h"
+#include "pinctrl-state.h"
 
 enum pinctrl_map_type {
 	PIN_MAP_TYPE_INVALID,
diff --git a/trunk/include/linux/pinctrl/pinctrl-state.h b/trunk/include/linux/pinctrl/pinctrl-state.h
new file mode 100644
index 000000000000..3920e28b4da7
--- /dev/null
+++ b/trunk/include/linux/pinctrl/pinctrl-state.h
@@ -0,0 +1,6 @@
+/*
+ * Standard pin control state definitions
+ */
+
+#define PINCTRL_STATE_DEFAULT "default"
+#define PINCTRL_STATE_IDLE "idle"
diff --git a/trunk/include/linux/pinctrl/pinctrl.h b/trunk/include/linux/pinctrl/pinctrl.h
index bbdd7e16bada..e9e94eb52d79 100644
--- a/trunk/include/linux/pinctrl/pinctrl.h
+++ b/trunk/include/linux/pinctrl/pinctrl.h
@@ -17,8 +17,7 @@
 #include <linux/radix-tree.h>
 #include <linux/list.h>
 #include <linux/seq_file.h>
-
-#define PINCTRL_STATE_DEFAULT "default"
+#include "pinctrl-state.h"
 
 struct pinctrl_dev;
 struct pinmux_ops;