diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /fs/ext3/resize.c | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/ext3/resize.c')
| -rw-r--r-- | fs/ext3/resize.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c index b73cba12f79c..ecf89904c113 100644 --- a/fs/ext3/resize.c +++ b/fs/ext3/resize.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | #define EXT3FS_DEBUG | 12 | #define EXT3FS_DEBUG |
| 13 | 13 | ||
| 14 | #include <linux/sched.h> | ||
| 15 | #include <linux/smp_lock.h> | 14 | #include <linux/smp_lock.h> |
| 16 | #include <linux/ext3_jbd.h> | 15 | #include <linux/ext3_jbd.h> |
| 17 | 16 | ||