diff options
| -rw-r--r-- | drivers/ipack/carriers/tpci200.h | 3 | ||||
| -rw-r--r-- | drivers/ipack/devices/ipoctal.c | 3 | ||||
| -rw-r--r-- | drivers/ipack/ipack.c | 3 | ||||
| -rw-r--r-- | include/linux/ipack.h (renamed from drivers/ipack/ipack.h) | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/drivers/ipack/carriers/tpci200.h b/drivers/ipack/carriers/tpci200.h index 8d9be277b34..a7a151dab83 100644 --- a/drivers/ipack/carriers/tpci200.h +++ b/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/drivers/ipack/devices/ipoctal.c b/drivers/ipack/devices/ipoctal.c index 783f120338d..7f568e268a1 100644 --- a/drivers/ipack/devices/ipoctal.c +++ b/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/drivers/ipack/ipack.c b/drivers/ipack/ipack.c index 6d5079de52b..cc5498347ac 100644 --- a/drivers/ipack/ipack.c +++ b/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/drivers/ipack/ipack.h b/include/linux/ipack.h index 6760bfaf0ac..7a0a3085ab5 100644 --- a/drivers/ipack/ipack.h +++ b/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 |