Merge tag 'for-v3.4-rc1' of git://git.infradead.org/battery-2.6

[~andy/linux] / include / linux / mfd / abx500.h

diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
index 8344196b0004da66bf988e7811a14e778f83666e..ee96cd51d8b23b54683950a50831cb5cda65d2ac 100644 (file)
--- a/include/linux/mfd/abx500.h
+++ b/include/linux/mfd/abx500.h
@@ -14,9 +14,10 @@
  * Author: Rickard Andersson <rickard.andersson@stericsson.com>
  */
 
-#include <linux/device.h>
 #include <linux/regulator/machine.h>
 
+struct device;
+
 #ifndef MFD_ABX500_H
 #define MFD_ABX500_H
 
@@ -33,13 +34,6 @@
 #define AB5500_1_1     0x21
 #define AB5500_2_0     0x24
 
-/* AB8500 CIDs*/
-#define AB8500_CUT1P0  0x10
-#define AB8500_CUT1P1  0x11
-#define AB8500_CUT2P0  0x20
-#define AB8500_CUT3P0  0x30
-#define AB8500_CUT3P3  0x33
-
 /*
  * AB3100, EVENTA1, A2 and A3 event register flags
  * these are catenated into a single 32-bit flag in the code