diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /fs/xfs/linux-2.6/xfs_linux.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_linux.h')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_linux.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/xfs/linux-2.6/xfs_linux.h b/fs/xfs/linux-2.6/xfs_linux.h index 6127e24062d0..facfb323a706 100644 --- a/fs/xfs/linux-2.6/xfs_linux.h +++ b/fs/xfs/linux-2.6/xfs_linux.h | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #include <sv.h> | 40 | #include <sv.h> |
| 41 | #include <time.h> | 41 | #include <time.h> |
| 42 | 42 | ||
| 43 | #include <support/ktrace.h> | ||
| 44 | #include <support/debug.h> | 43 | #include <support/debug.h> |
| 45 | #include <support/uuid.h> | 44 | #include <support/uuid.h> |
| 46 | 45 | ||
| @@ -89,7 +88,6 @@ | |||
| 89 | #include <xfs_super.h> | 88 | #include <xfs_super.h> |
| 90 | #include <xfs_globals.h> | 89 | #include <xfs_globals.h> |
| 91 | #include <xfs_fs_subr.h> | 90 | #include <xfs_fs_subr.h> |
| 92 | #include <xfs_lrw.h> | ||
| 93 | #include <xfs_buf.h> | 91 | #include <xfs_buf.h> |
| 94 | 92 | ||
| 95 | /* | 93 | /* |