diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /fs/coda/coda_linux.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'fs/coda/coda_linux.c')
| -rw-r--r-- | fs/coda/coda_linux.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/coda/coda_linux.c b/fs/coda/coda_linux.c index bf4a3fd3c8e3..2bdbcc11b373 100644 --- a/fs/coda/coda_linux.c +++ b/fs/coda/coda_linux.c | |||
| @@ -17,9 +17,8 @@ | |||
| 17 | #include <linux/string.h> | 17 | #include <linux/string.h> |
| 18 | 18 | ||
| 19 | #include <linux/coda.h> | 19 | #include <linux/coda.h> |
| 20 | #include <linux/coda_linux.h> | ||
| 21 | #include <linux/coda_psdev.h> | 20 | #include <linux/coda_psdev.h> |
| 22 | #include <linux/coda_fs_i.h> | 21 | #include "coda_linux.h" |
| 23 | 22 | ||
| 24 | /* initialize the debugging variables */ | 23 | /* initialize the debugging variables */ |
| 25 | int coda_fake_statfs; | 24 | int coda_fake_statfs; |