diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2009-09-26 11:37:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 13:17:19 -0400 |
commit | 1d1764c39815db55e10b2d78732db4d6dd9d6039 (patch) | |
tree | 4511bd9b696d86eae2922239407a9655abf6c80b | |
parent | 3b383767c41be070cae24875789d97b42a3e71a8 (diff) |
headers: kref.h redux
* remove asm/atomic.h inclusion from kref.h -- not needed, linux/types.h
is enough for atomic_t
* remove linux/kref.h inclusion from files which do not need it.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/net/irda/kingsun-sir.c | 1 | ||||
-rw-r--r-- | drivers/net/irda/ks959-sir.c | 1 | ||||
-rw-r--r-- | drivers/net/irda/ksdazzle-sir.c | 1 | ||||
-rw-r--r-- | drivers/net/irda/mcs7780.c | 1 | ||||
-rw-r--r-- | drivers/scsi/pmcraid.h | 1 | ||||
-rw-r--r-- | drivers/usb/misc/sisusbvga/sisusb_init.c | 1 | ||||
-rw-r--r-- | include/linux/ipc.h | 2 | ||||
-rw-r--r-- | include/linux/kref.h | 1 | ||||
-rw-r--r-- | include/linux/nfs_fs.h | 1 |
9 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c index 2fc30b449eea..cb90d640007a 100644 --- a/drivers/net/irda/kingsun-sir.c +++ b/drivers/net/irda/kingsun-sir.c | |||
@@ -66,7 +66,6 @@ | |||
66 | #include <linux/errno.h> | 66 | #include <linux/errno.h> |
67 | #include <linux/init.h> | 67 | #include <linux/init.h> |
68 | #include <linux/slab.h> | 68 | #include <linux/slab.h> |
69 | #include <linux/kref.h> | ||
70 | #include <linux/usb.h> | 69 | #include <linux/usb.h> |
71 | #include <linux/device.h> | 70 | #include <linux/device.h> |
72 | #include <linux/crc32.h> | 71 | #include <linux/crc32.h> |
diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c index f4d13fc51cbc..b54d3b48045e 100644 --- a/drivers/net/irda/ks959-sir.c +++ b/drivers/net/irda/ks959-sir.c | |||
@@ -118,7 +118,6 @@ | |||
118 | #include <linux/errno.h> | 118 | #include <linux/errno.h> |
119 | #include <linux/init.h> | 119 | #include <linux/init.h> |
120 | #include <linux/slab.h> | 120 | #include <linux/slab.h> |
121 | #include <linux/kref.h> | ||
122 | #include <linux/usb.h> | 121 | #include <linux/usb.h> |
123 | #include <linux/device.h> | 122 | #include <linux/device.h> |
124 | #include <linux/crc32.h> | 123 | #include <linux/crc32.h> |
diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/net/irda/ksdazzle-sir.c index 5f9d73353972..8d713ebac15b 100644 --- a/drivers/net/irda/ksdazzle-sir.c +++ b/drivers/net/irda/ksdazzle-sir.c | |||
@@ -82,7 +82,6 @@ | |||
82 | #include <linux/errno.h> | 82 | #include <linux/errno.h> |
83 | #include <linux/init.h> | 83 | #include <linux/init.h> |
84 | #include <linux/slab.h> | 84 | #include <linux/slab.h> |
85 | #include <linux/kref.h> | ||
86 | #include <linux/usb.h> | 85 | #include <linux/usb.h> |
87 | #include <linux/device.h> | 86 | #include <linux/device.h> |
88 | #include <linux/crc32.h> | 87 | #include <linux/crc32.h> |
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c index b3d30bcb88e7..c0e0bb9401d3 100644 --- a/drivers/net/irda/mcs7780.c +++ b/drivers/net/irda/mcs7780.c | |||
@@ -50,7 +50,6 @@ | |||
50 | #include <linux/errno.h> | 50 | #include <linux/errno.h> |
51 | #include <linux/init.h> | 51 | #include <linux/init.h> |
52 | #include <linux/slab.h> | 52 | #include <linux/slab.h> |
53 | #include <linux/kref.h> | ||
54 | #include <linux/usb.h> | 53 | #include <linux/usb.h> |
55 | #include <linux/device.h> | 54 | #include <linux/device.h> |
56 | #include <linux/crc32.h> | 55 | #include <linux/crc32.h> |
diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h index 614b3a764fed..3441b3f90827 100644 --- a/drivers/scsi/pmcraid.h +++ b/drivers/scsi/pmcraid.h | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/completion.h> | 26 | #include <linux/completion.h> |
27 | #include <linux/list.h> | 27 | #include <linux/list.h> |
28 | #include <scsi/scsi.h> | 28 | #include <scsi/scsi.h> |
29 | #include <linux/kref.h> | ||
30 | #include <scsi/scsi_cmnd.h> | 29 | #include <scsi/scsi_cmnd.h> |
31 | #include <linux/cdev.h> | 30 | #include <linux/cdev.h> |
32 | #include <net/netlink.h> | 31 | #include <net/netlink.h> |
diff --git a/drivers/usb/misc/sisusbvga/sisusb_init.c b/drivers/usb/misc/sisusbvga/sisusb_init.c index 273de5d0934e..0ab990744830 100644 --- a/drivers/usb/misc/sisusbvga/sisusb_init.c +++ b/drivers/usb/misc/sisusbvga/sisusb_init.c | |||
@@ -43,7 +43,6 @@ | |||
43 | #include <linux/init.h> | 43 | #include <linux/init.h> |
44 | #include <linux/slab.h> | 44 | #include <linux/slab.h> |
45 | #include <linux/spinlock.h> | 45 | #include <linux/spinlock.h> |
46 | #include <linux/kref.h> | ||
47 | 46 | ||
48 | #include "sisusb.h" | 47 | #include "sisusb.h" |
49 | 48 | ||
diff --git a/include/linux/ipc.h b/include/linux/ipc.h index b8826107b518..3b1594d662b0 100644 --- a/include/linux/ipc.h +++ b/include/linux/ipc.h | |||
@@ -78,8 +78,6 @@ struct ipc_kludge { | |||
78 | #define IPCCALL(version,op) ((version)<<16 | (op)) | 78 | #define IPCCALL(version,op) ((version)<<16 | (op)) |
79 | 79 | ||
80 | #ifdef __KERNEL__ | 80 | #ifdef __KERNEL__ |
81 | |||
82 | #include <linux/kref.h> | ||
83 | #include <linux/spinlock.h> | 81 | #include <linux/spinlock.h> |
84 | 82 | ||
85 | #define IPCMNI 32768 /* <= MAX_INT limit for ipc arrays (including sysctl changes) */ | 83 | #define IPCMNI 32768 /* <= MAX_INT limit for ipc arrays (including sysctl changes) */ |
diff --git a/include/linux/kref.h b/include/linux/kref.h index 0cef6badd6fb..b0cb0ebad9e6 100644 --- a/include/linux/kref.h +++ b/include/linux/kref.h | |||
@@ -16,7 +16,6 @@ | |||
16 | #define _KREF_H_ | 16 | #define _KREF_H_ |
17 | 17 | ||
18 | #include <linux/types.h> | 18 | #include <linux/types.h> |
19 | #include <asm/atomic.h> | ||
20 | 19 | ||
21 | struct kref { | 20 | struct kref { |
22 | atomic_t refcount; | 21 | atomic_t refcount; |
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index f6b90240dd41..d09db1bc9083 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h | |||
@@ -40,7 +40,6 @@ | |||
40 | #ifdef __KERNEL__ | 40 | #ifdef __KERNEL__ |
41 | 41 | ||
42 | #include <linux/in.h> | 42 | #include <linux/in.h> |
43 | #include <linux/kref.h> | ||
44 | #include <linux/mm.h> | 43 | #include <linux/mm.h> |
45 | #include <linux/pagemap.h> | 44 | #include <linux/pagemap.h> |
46 | #include <linux/rbtree.h> | 45 | #include <linux/rbtree.h> |