diff options
author | Samuel Iglesias Gonsalvez <siglesias@igalia.com> | 2012-11-16 13:33:45 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-16 14:29:35 -0500 |
commit | 7dbce021a6df9d4812385d11729140829abc3f95 (patch) | |
tree | edc216569234ff566e84bc692800f4f945658925 | |
parent | 14dc124f1b2feebe1883bb8b51545d26eaca99b7 (diff) |
ipack: move header files to include/linux
Move ipack header files to include/linux/ directory where they belong.
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 8d9be277b34d..a7a151dab83c 100644 --- a/drivers/ipack/carriers/tpci200.h +++ b/drivers/ipack/carriers/tpci200.h | |||
@@ -20,8 +20,7 @@ | |||
20 | #include <linux/spinlock.h> | 20 | #include <linux/spinlock.h> |
21 | #include <linux/swab.h> | 21 | #include <linux/swab.h> |
22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
23 | 23 | #include <linux/ipack.h> | |
24 | #include "../ipack.h" | ||
25 | 24 | ||
26 | #define TPCI200_NB_SLOT 0x4 | 25 | #define TPCI200_NB_SLOT 0x4 |
27 | #define TPCI200_NB_BAR 0x6 | 26 | #define TPCI200_NB_BAR 0x6 |
diff --git a/drivers/ipack/devices/ipoctal.c b/drivers/ipack/devices/ipoctal.c index 783f120338d1..7f568e268a1e 100644 --- a/drivers/ipack/devices/ipoctal.c +++ b/drivers/ipack/devices/ipoctal.c | |||
@@ -22,7 +22,8 @@ | |||
22 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
23 | #include <linux/atomic.h> | 23 | #include <linux/atomic.h> |
24 | #include <linux/io.h> | 24 | #include <linux/io.h> |
25 | #include "../ipack.h" | 25 | #include <linux/ipack.h> |
26 | #include "../ipack_ids.h" | ||
26 | #include "ipoctal.h" | 27 | #include "ipoctal.h" |
27 | #include "scc2698.h" | 28 | #include "scc2698.h" |
28 | 29 | ||
diff --git a/drivers/ipack/ipack.c b/drivers/ipack/ipack.c index 6d5079de52b9..cc5498347acb 100644 --- a/drivers/ipack/ipack.c +++ b/drivers/ipack/ipack.c | |||
@@ -13,7 +13,8 @@ | |||
13 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
14 | #include <linux/idr.h> | 14 | #include <linux/idr.h> |
15 | #include <linux/io.h> | 15 | #include <linux/io.h> |
16 | #include "ipack.h" | 16 | #include <linux/ipack.h> |
17 | #include "ipack_ids.h" | ||
17 | 18 | ||
18 | #define to_ipack_dev(device) container_of(device, struct ipack_device, dev) | 19 | #define to_ipack_dev(device) container_of(device, struct ipack_device, dev) |
19 | #define to_ipack_driver(drv) container_of(drv, struct ipack_driver, driver) | 20 | #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 6760bfaf0ac4..7a0a3085ab5b 100644 --- a/drivers/ipack/ipack.h +++ b/include/linux/ipack.h | |||
@@ -13,8 +13,6 @@ | |||
13 | #include <linux/device.h> | 13 | #include <linux/device.h> |
14 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
15 | 15 | ||
16 | #include "ipack_ids.h" | ||
17 | |||
18 | #define IPACK_IDPROM_OFFSET_I 0x01 | 16 | #define IPACK_IDPROM_OFFSET_I 0x01 |
19 | #define IPACK_IDPROM_OFFSET_P 0x03 | 17 | #define IPACK_IDPROM_OFFSET_P 0x03 |
20 | #define IPACK_IDPROM_OFFSET_A 0x05 | 18 | #define IPACK_IDPROM_OFFSET_A 0x05 |