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 /drivers/mtd/ftl.c | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/mtd/ftl.c')
| -rw-r--r-- | drivers/mtd/ftl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c index 24235d4f1d23..c815d0f38577 100644 --- a/drivers/mtd/ftl.c +++ b/drivers/mtd/ftl.c | |||
| @@ -61,7 +61,6 @@ | |||
| 61 | /*#define PSYCHO_DEBUG */ | 61 | /*#define PSYCHO_DEBUG */ |
| 62 | 62 | ||
| 63 | #include <linux/kernel.h> | 63 | #include <linux/kernel.h> |
| 64 | #include <linux/sched.h> | ||
| 65 | #include <linux/ptrace.h> | 64 | #include <linux/ptrace.h> |
| 66 | #include <linux/slab.h> | 65 | #include <linux/slab.h> |
| 67 | #include <linux/string.h> | 66 | #include <linux/string.h> |