diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-24 16:17:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-24 16:17:06 -0500 |
| commit | e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb (patch) | |
| tree | 6d30e5e7b7f8e9aaa51d43b7128ac56860fa03bb /fs/coda/cnode.c | |
| parent | c506653d35249bb4738bb139c24362e1ae724bc1 (diff) | |
| parent | ec30f343d61391ab23705e50a525da1d55395780 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/coda/cnode.c')
| -rw-r--r-- | fs/coda/cnode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/coda/cnode.c b/fs/coda/cnode.c index 602240569c89..6475877b0763 100644 --- a/fs/coda/cnode.c +++ b/fs/coda/cnode.c | |||
| @@ -7,9 +7,8 @@ | |||
| 7 | #include <linux/time.h> | 7 | #include <linux/time.h> |
| 8 | 8 | ||
| 9 | #include <linux/coda.h> | 9 | #include <linux/coda.h> |
| 10 | #include <linux/coda_linux.h> | ||
| 11 | #include <linux/coda_fs_i.h> | ||
| 12 | #include <linux/coda_psdev.h> | 10 | #include <linux/coda_psdev.h> |
| 11 | #include "coda_linux.h" | ||
| 13 | 12 | ||
| 14 | static inline int coda_fideq(struct CodaFid *fid1, struct CodaFid *fid2) | 13 | static inline int coda_fideq(struct CodaFid *fid1, struct CodaFid *fid2) |
| 15 | { | 14 | { |