---

yaml --- r: 337983 b: refs/heads/master c: 7dbce02 h: refs/heads/master i: 337981: 700ee96 337979: 2dc78e8 337975: 7431e56 337967: 484dcc3 337951: 48c57ff 337919: 69910e8 v: v3
git-mirror · Nov 16, 2012 · 53277b3 · 53277b3
1 parent aa9416a
commit 53277b3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14dc124f1b2feebe1883bb8b51545d26eaca99b7
+refs/heads/master: 7dbce021a6df9d4812385d11729140829abc3f95
diff --git a/trunk/drivers/ipack/carriers/tpci200.h b/trunk/drivers/ipack/carriers/tpci200.h
@@ -20,8 +20,7 @@
 #include <linux/spinlock.h>
 #include <linux/swab.h>
 #include <linux/io.h>
-
-#include "../ipack.h"
+#include <linux/ipack.h>
 
 #define TPCI200_NB_SLOT               0x4
 #define TPCI200_NB_BAR                0x6

diff --git a/trunk/drivers/ipack/devices/ipoctal.c b/trunk/drivers/ipack/devices/ipoctal.c
@@ -22,7 +22,8 @@
 #include <linux/slab.h>
 #include <linux/atomic.h>
 #include <linux/io.h>
-#include "../ipack.h"
+#include <linux/ipack.h>
+#include "../ipack_ids.h"
 #include "ipoctal.h"
 #include "scc2698.h"
 

diff --git a/trunk/drivers/ipack/ipack.c b/trunk/drivers/ipack/ipack.c
@@ -13,7 +13,8 @@
 #include <linux/slab.h>
 #include <linux/idr.h>
 #include <linux/io.h>
-#include "ipack.h"
+#include <linux/ipack.h>
+#include "ipack_ids.h"
 
 #define to_ipack_dev(device) container_of(device, struct ipack_device, dev)
 #define to_ipack_driver(drv) container_of(drv, struct ipack_driver, driver)

diff --git a/trunk/drivers/ipack/ipack.h → trunk/include/linux/ipack.h b/trunk/drivers/ipack/ipack.h → trunk/include/linux/ipack.h
@@ -13,8 +13,6 @@
 #include <linux/device.h>
 #include <linux/interrupt.h>
 
-#include "ipack_ids.h"
-
 #define IPACK_IDPROM_OFFSET_I			0x01
 #define IPACK_IDPROM_OFFSET_P			0x03
 #define IPACK_IDPROM_OFFSET_A			0x05