From 53277b33998b0d32023096ff20b77eb7970c01f1 Mon Sep 17 00:00:00 2001
From: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Date: Fri, 16 Nov 2012 19:33:45 +0100
Subject: [PATCH] --- yaml --- r: 337983 b: refs/heads/master c:
 7dbce021a6df9d4812385d11729140829abc3f95 h: refs/heads/master i:   337981:
 700ee9607bff5f17d52992b4b8e85545a7d4b1e4   337979:
 2dc78e86a510d9f9e41e2061153b18f620a98117   337975:
 7431e5695cef14f9c42223cfe42d439dea71bb68   337967:
 484dcc3295aa92a3ab38803fe446a047a8976de6   337951:
 48c57ffeb35253bcbbd7dd41aab367b382aeb772   337919:
 69910e8087cd05a8058aafc312ec50b7273ccc8a v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/ipack/carriers/tpci200.h         | 3 +--
 trunk/drivers/ipack/devices/ipoctal.c          | 3 ++-
 trunk/drivers/ipack/ipack.c                    | 3 ++-
 trunk/{drivers/ipack => include/linux}/ipack.h | 2 --
 5 files changed, 6 insertions(+), 7 deletions(-)
 rename trunk/{drivers/ipack => include/linux}/ipack.h (99%)

diff --git a/[refs] b/[refs]
index 75710238c43b..84a321146493 100644
--- 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
index 8d9be277b34d..a7a151dab83c 100644
--- 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
index 783f120338d1..7f568e268a1e 100644
--- 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
index 6d5079de52b9..cc5498347acb 100644
--- 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 b/trunk/include/linux/ipack.h
similarity index 99%
rename from trunk/drivers/ipack/ipack.h
rename to trunk/include/linux/ipack.h
index 6760bfaf0ac4..7a0a3085ab5b 100644
--- a/trunk/drivers/ipack/ipack.h
+++ b/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