aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/bcma/bcma.h2
-rw-r--r--include/linux/ceph/ceph_fs.h4
-rw-r--r--include/linux/ceph/debugfs.h4
-rw-r--r--include/linux/ceph/decode.h2
-rw-r--r--include/linux/ceph/libceph.h14
-rw-r--r--include/linux/ceph/mdsmap.h2
-rw-r--r--include/linux/ceph/messenger.h4
-rw-r--r--include/linux/ceph/mon_client.h2
-rw-r--r--include/linux/ceph/msgpool.h2
-rw-r--r--include/linux/ceph/osdmap.h4
-rw-r--r--include/linux/ceph/rados.h2
-rw-r--r--include/linux/ceph/types.h6
-rw-r--r--include/linux/crush/mapper.h2
-rw-r--r--include/linux/drbd_tag_magic.h8
-rw-r--r--include/linux/libfdt.h4
-rw-r--r--include/linux/netfilter/nf_conntrack_h323_asn1.h2
-rw-r--r--include/linux/pinctrl/consumer.h2
-rw-r--r--include/linux/pinctrl/machine.h2
-rw-r--r--include/linux/pinctrl/pinctrl.h2
-rw-r--r--include/linux/pinctrl/pinmux.h2
20 files changed, 36 insertions, 36 deletions
diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index 1954a4e305a3..4180eb78d575 100644
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
@@ -10,7 +10,7 @@
10#include <linux/bcma/bcma_driver_gmac_cmn.h> 10#include <linux/bcma/bcma_driver_gmac_cmn.h>
11#include <linux/ssb/ssb.h> /* SPROM sharing */ 11#include <linux/ssb/ssb.h> /* SPROM sharing */
12 12
13#include "bcma_regs.h" 13#include <linux/bcma/bcma_regs.h>
14 14
15struct bcma_device; 15struct bcma_device;
16struct bcma_bus; 16struct bcma_bus;
diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h
index d021610efd65..cf6f4d998a76 100644
--- a/include/linux/ceph/ceph_fs.h
+++ b/include/linux/ceph/ceph_fs.h
@@ -12,8 +12,8 @@
12#ifndef CEPH_FS_H 12#ifndef CEPH_FS_H
13#define CEPH_FS_H 13#define CEPH_FS_H
14 14
15#include "msgr.h" 15#include <linux/ceph/msgr.h>
16#include "rados.h" 16#include <linux/ceph/rados.h>
17 17
18/* 18/*
19 * subprotocol versions. when specific messages types or high-level 19 * subprotocol versions. when specific messages types or high-level
diff --git a/include/linux/ceph/debugfs.h b/include/linux/ceph/debugfs.h
index 2a79702e092b..1df086d7882d 100644
--- a/include/linux/ceph/debugfs.h
+++ b/include/linux/ceph/debugfs.h
@@ -1,8 +1,8 @@
1#ifndef _FS_CEPH_DEBUGFS_H 1#ifndef _FS_CEPH_DEBUGFS_H
2#define _FS_CEPH_DEBUGFS_H 2#define _FS_CEPH_DEBUGFS_H
3 3
4#include "ceph_debug.h" 4#include <linux/ceph/ceph_debug.h>
5#include "types.h" 5#include <linux/ceph/types.h>
6 6
7#define CEPH_DEFINE_SHOW_FUNC(name) \ 7#define CEPH_DEFINE_SHOW_FUNC(name) \
8static int name##_open(struct inode *inode, struct file *file) \ 8static int name##_open(struct inode *inode, struct file *file) \
diff --git a/include/linux/ceph/decode.h b/include/linux/ceph/decode.h
index 4bbf2db45f46..63d092822bad 100644
--- a/include/linux/ceph/decode.h
+++ b/include/linux/ceph/decode.h
@@ -6,7 +6,7 @@
6#include <linux/time.h> 6#include <linux/time.h>
7#include <asm/unaligned.h> 7#include <asm/unaligned.h>
8 8
9#include "types.h" 9#include <linux/ceph/types.h>
10 10
11/* 11/*
12 * in all cases, 12 * in all cases,
diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
index 42624789b06f..6470792b13d3 100644
--- a/include/linux/ceph/libceph.h
+++ b/include/linux/ceph/libceph.h
@@ -1,7 +1,7 @@
1#ifndef _FS_CEPH_LIBCEPH_H 1#ifndef _FS_CEPH_LIBCEPH_H
2#define _FS_CEPH_LIBCEPH_H 2#define _FS_CEPH_LIBCEPH_H
3 3
4#include "ceph_debug.h" 4#include <linux/ceph/ceph_debug.h>
5 5
6#include <asm/unaligned.h> 6#include <asm/unaligned.h>
7#include <linux/backing-dev.h> 7#include <linux/backing-dev.h>
@@ -15,12 +15,12 @@
15#include <linux/writeback.h> 15#include <linux/writeback.h>
16#include <linux/slab.h> 16#include <linux/slab.h>
17 17
18#include "types.h" 18#include <linux/ceph/types.h>
19#include "messenger.h" 19#include <linux/ceph/messenger.h>
20#include "msgpool.h" 20#include <linux/ceph/msgpool.h>
21#include "mon_client.h" 21#include <linux/ceph/mon_client.h>
22#include "osd_client.h" 22#include <linux/ceph/osd_client.h>
23#include "ceph_fs.h" 23#include <linux/ceph/ceph_fs.h>
24 24
25/* 25/*
26 * mount options 26 * mount options
diff --git a/include/linux/ceph/mdsmap.h b/include/linux/ceph/mdsmap.h
index 9935fac8c107..cb15b5d867c7 100644
--- a/include/linux/ceph/mdsmap.h
+++ b/include/linux/ceph/mdsmap.h
@@ -2,7 +2,7 @@
2#define _FS_CEPH_MDSMAP_H 2#define _FS_CEPH_MDSMAP_H
3 3
4#include <linux/bug.h> 4#include <linux/bug.h>
5#include "types.h" 5#include <linux/ceph/types.h>
6 6
7/* 7/*
8 * mds map - describe servers in the mds cluster. 8 * mds map - describe servers in the mds cluster.
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h
index 189ae0637634..14ba5ee738a9 100644
--- a/include/linux/ceph/messenger.h
+++ b/include/linux/ceph/messenger.h
@@ -8,8 +8,8 @@
8#include <linux/uio.h> 8#include <linux/uio.h>
9#include <linux/workqueue.h> 9#include <linux/workqueue.h>
10 10
11#include "types.h" 11#include <linux/ceph/types.h>
12#include "buffer.h" 12#include <linux/ceph/buffer.h>
13 13
14struct ceph_msg; 14struct ceph_msg;
15struct ceph_connection; 15struct ceph_connection;
diff --git a/include/linux/ceph/mon_client.h b/include/linux/ceph/mon_client.h
index 2113e3850a4e..1fb93e9080b0 100644
--- a/include/linux/ceph/mon_client.h
+++ b/include/linux/ceph/mon_client.h
@@ -5,7 +5,7 @@
5#include <linux/kref.h> 5#include <linux/kref.h>
6#include <linux/rbtree.h> 6#include <linux/rbtree.h>
7 7
8#include "messenger.h" 8#include <linux/ceph/messenger.h>
9 9
10struct ceph_client; 10struct ceph_client;
11struct ceph_mount_args; 11struct ceph_mount_args;
diff --git a/include/linux/ceph/msgpool.h b/include/linux/ceph/msgpool.h
index 09fa96b43436..4b0d38960726 100644
--- a/include/linux/ceph/msgpool.h
+++ b/include/linux/ceph/msgpool.h
@@ -2,7 +2,7 @@
2#define _FS_CEPH_MSGPOOL 2#define _FS_CEPH_MSGPOOL
3 3
4#include <linux/mempool.h> 4#include <linux/mempool.h>
5#include "messenger.h" 5#include <linux/ceph/messenger.h>
6 6
7/* 7/*
8 * we use memory pools for preallocating messages we may receive, to 8 * we use memory pools for preallocating messages we may receive, to
diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h
index 311ef8d6aa9e..25b930bffea6 100644
--- a/include/linux/ceph/osdmap.h
+++ b/include/linux/ceph/osdmap.h
@@ -2,8 +2,8 @@
2#define _FS_CEPH_OSDMAP_H 2#define _FS_CEPH_OSDMAP_H
3 3
4#include <linux/rbtree.h> 4#include <linux/rbtree.h>
5#include "types.h" 5#include <linux/ceph/types.h>
6#include "ceph_fs.h" 6#include <linux/ceph/ceph_fs.h>
7#include <linux/crush/crush.h> 7#include <linux/crush/crush.h>
8 8
9/* 9/*
diff --git a/include/linux/ceph/rados.h b/include/linux/ceph/rados.h
index 0a99099801a4..de91fbdf127e 100644
--- a/include/linux/ceph/rados.h
+++ b/include/linux/ceph/rados.h
@@ -6,7 +6,7 @@
6 * (Reliable Autonomic Distributed Object Store). 6 * (Reliable Autonomic Distributed Object Store).
7 */ 7 */
8 8
9#include "msgr.h" 9#include <linux/ceph/msgr.h>
10 10
11/* 11/*
12 * osdmap encoding versions 12 * osdmap encoding versions
diff --git a/include/linux/ceph/types.h b/include/linux/ceph/types.h
index 28b35a005ec2..d3ff1cf2d27e 100644
--- a/include/linux/ceph/types.h
+++ b/include/linux/ceph/types.h
@@ -7,9 +7,9 @@
7#include <linux/fcntl.h> 7#include <linux/fcntl.h>
8#include <linux/string.h> 8#include <linux/string.h>
9 9
10#include "ceph_fs.h" 10#include <linux/ceph/ceph_fs.h>
11#include "ceph_frag.h" 11#include <linux/ceph/ceph_frag.h>
12#include "ceph_hash.h" 12#include <linux/ceph/ceph_hash.h>
13 13
14/* 14/*
15 * Identify inodes by both their ino AND snapshot id (a u64). 15 * Identify inodes by both their ino AND snapshot id (a u64).
diff --git a/include/linux/crush/mapper.h b/include/linux/crush/mapper.h
index 71d79f44a7d0..5772dee3ecbf 100644
--- a/include/linux/crush/mapper.h
+++ b/include/linux/crush/mapper.h
@@ -8,7 +8,7 @@
8 * LGPL2 8 * LGPL2
9 */ 9 */
10 10
11#include "crush.h" 11#include <linux/crush/crush.h>
12 12
13extern int crush_find_rule(const struct crush_map *map, int ruleset, int type, int size); 13extern int crush_find_rule(const struct crush_map *map, int ruleset, int type, int size);
14extern int crush_do_rule(const struct crush_map *map, 14extern int crush_do_rule(const struct crush_map *map,
diff --git a/include/linux/drbd_tag_magic.h b/include/linux/drbd_tag_magic.h
index 81f52f2c5724..82de1f9e48b1 100644
--- a/include/linux/drbd_tag_magic.h
+++ b/include/linux/drbd_tag_magic.h
@@ -12,7 +12,7 @@ enum packet_types {
12#define NL_INT64(pn, pr, member) 12#define NL_INT64(pn, pr, member)
13#define NL_BIT(pn, pr, member) 13#define NL_BIT(pn, pr, member)
14#define NL_STRING(pn, pr, member, len) 14#define NL_STRING(pn, pr, member, len)
15#include "drbd_nl.h" 15#include <linux/drbd_nl.h>
16 P_nl_after_last_packet, 16 P_nl_after_last_packet,
17}; 17};
18 18
@@ -37,7 +37,7 @@ static const int tag_list_sizes[] = {
37#define NL_INT64(pn, pr, member) + 4 + 8 37#define NL_INT64(pn, pr, member) + 4 + 8
38#define NL_BIT(pn, pr, member) + 4 + 1 38#define NL_BIT(pn, pr, member) + 4 + 1
39#define NL_STRING(pn, pr, member, len) + 4 + (len) 39#define NL_STRING(pn, pr, member, len) + 4 + (len)
40#include "drbd_nl.h" 40#include <linux/drbd_nl.h>
41}; 41};
42 42
43/* The two highest bits are used for the tag type */ 43/* The two highest bits are used for the tag type */
@@ -62,7 +62,7 @@ enum drbd_tags {
62#define NL_INT64(pn, pr, member) T_ ## member = pn | TT_INT64 | pr , 62#define NL_INT64(pn, pr, member) T_ ## member = pn | TT_INT64 | pr ,
63#define NL_BIT(pn, pr, member) T_ ## member = pn | TT_BIT | pr , 63#define NL_BIT(pn, pr, member) T_ ## member = pn | TT_BIT | pr ,
64#define NL_STRING(pn, pr, member, len) T_ ## member = pn | TT_STRING | pr , 64#define NL_STRING(pn, pr, member, len) T_ ## member = pn | TT_STRING | pr ,
65#include "drbd_nl.h" 65#include <linux/drbd_nl.h>
66}; 66};
67 67
68struct tag { 68struct tag {
@@ -78,7 +78,7 @@ static const struct tag tag_descriptions[] = {
78#define NL_INT64(pn, pr, member) [ pn ] = { #member, TT_INT64 | pr, sizeof(__u64) }, 78#define NL_INT64(pn, pr, member) [ pn ] = { #member, TT_INT64 | pr, sizeof(__u64) },
79#define NL_BIT(pn, pr, member) [ pn ] = { #member, TT_BIT | pr, sizeof(int) }, 79#define NL_BIT(pn, pr, member) [ pn ] = { #member, TT_BIT | pr, sizeof(int) },
80#define NL_STRING(pn, pr, member, len) [ pn ] = { #member, TT_STRING | pr, (len) }, 80#define NL_STRING(pn, pr, member, len) [ pn ] = { #member, TT_STRING | pr, (len) },
81#include "drbd_nl.h" 81#include <linux/drbd_nl.h>
82}; 82};
83 83
84#endif 84#endif
diff --git a/include/linux/libfdt.h b/include/linux/libfdt.h
index 4c0306c69b4e..a0c3bf6c9edb 100644
--- a/include/linux/libfdt.h
+++ b/include/linux/libfdt.h
@@ -2,7 +2,7 @@
2#define _INCLUDE_LIBFDT_H_ 2#define _INCLUDE_LIBFDT_H_
3 3
4#include <linux/libfdt_env.h> 4#include <linux/libfdt_env.h>
5#include "../../scripts/dtc/libfdt/fdt.h" 5#include <>
6#include "../../scripts/dtc/libfdt/libfdt.h" 6#include <>
7 7
8#endif /* _INCLUDE_LIBFDT_H_ */ 8#endif /* _INCLUDE_LIBFDT_H_ */
diff --git a/include/linux/netfilter/nf_conntrack_h323_asn1.h b/include/linux/netfilter/nf_conntrack_h323_asn1.h
index 8dab5968fc7e..3176a277eed1 100644
--- a/include/linux/netfilter/nf_conntrack_h323_asn1.h
+++ b/include/linux/netfilter/nf_conntrack_h323_asn1.h
@@ -40,7 +40,7 @@
40/***************************************************************************** 40/*****************************************************************************
41 * H.323 Types 41 * H.323 Types
42 ****************************************************************************/ 42 ****************************************************************************/
43#include "nf_conntrack_h323_types.h" 43#include <linux/netfilter/nf_conntrack_h323_types.h>
44 44
45typedef struct { 45typedef struct {
46 enum { 46 enum {
diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h
index e9b7f4350844..cbb07f850791 100644
--- a/include/linux/pinctrl/consumer.h
+++ b/include/linux/pinctrl/consumer.h
@@ -15,7 +15,7 @@
15#include <linux/err.h> 15#include <linux/err.h>
16#include <linux/list.h> 16#include <linux/list.h>
17#include <linux/seq_file.h> 17#include <linux/seq_file.h>
18#include "pinctrl-state.h" 18#include <linux/pinctrl/pinctrl-state.h>
19 19
20/* This struct is private to the core and should be regarded as a cookie */ 20/* This struct is private to the core and should be regarded as a cookie */
21struct pinctrl; 21struct pinctrl;
diff --git a/include/linux/pinctrl/machine.h b/include/linux/pinctrl/machine.h
index 7d22ab00343f..e5b1716f98cc 100644
--- a/include/linux/pinctrl/machine.h
+++ b/include/linux/pinctrl/machine.h
@@ -14,7 +14,7 @@
14 14
15#include <linux/bug.h> 15#include <linux/bug.h>
16 16
17#include "pinctrl-state.h" 17#include <linux/pinctrl/pinctrl-state.h>
18 18
19enum pinctrl_map_type { 19enum pinctrl_map_type {
20 PIN_MAP_TYPE_INVALID, 20 PIN_MAP_TYPE_INVALID,
diff --git a/include/linux/pinctrl/pinctrl.h b/include/linux/pinctrl/pinctrl.h
index 69393a662532..7d087f03e91e 100644
--- a/include/linux/pinctrl/pinctrl.h
+++ b/include/linux/pinctrl/pinctrl.h
@@ -17,7 +17,7 @@
17#include <linux/radix-tree.h> 17#include <linux/radix-tree.h>
18#include <linux/list.h> 18#include <linux/list.h>
19#include <linux/seq_file.h> 19#include <linux/seq_file.h>
20#include "pinctrl-state.h" 20#include <linux/pinctrl/pinctrl-state.h>
21 21
22struct device; 22struct device;
23struct pinctrl_dev; 23struct pinctrl_dev;
diff --git a/include/linux/pinctrl/pinmux.h b/include/linux/pinctrl/pinmux.h
index 1818dcbdd9ab..c15395031cb3 100644
--- a/include/linux/pinctrl/pinmux.h
+++ b/include/linux/pinctrl/pinmux.h
@@ -14,7 +14,7 @@
14 14
15#include <linux/list.h> 15#include <linux/list.h>
16#include <linux/seq_file.h> 16#include <linux/seq_file.h>
17#include "pinctrl.h" 17#include <linux/pinctrl/pinctrl.h>
18 18
19#ifdef CONFIG_PINMUX 19#ifdef CONFIG_PINMUX
20 20