diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 05:06:46 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 05:06:46 -0500 |
| commit | 1f04c0a24b2f3cfe89c802a24396263623e3512d (patch) | |
| tree | d7e2216b6e65b833c0c2b79b478d13ce17dbf296 /drivers/mtd/devices | |
| parent | 07b188ab773e183871e57b33ae37bf635c9f12ba (diff) | |
| parent | e2f2e58e7968f8446b1078a20a18bf8ea12b4fbc (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'drivers/mtd/devices')
| -rw-r--r-- | drivers/mtd/devices/lart.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/devices/phram.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mtd/devices/lart.c b/drivers/mtd/devices/lart.c index dfd335e4a2a8..df987a53ed9c 100644 --- a/drivers/mtd/devices/lart.c +++ b/drivers/mtd/devices/lart.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | #include <linux/types.h> | 44 | #include <linux/types.h> |
| 45 | #include <linux/init.h> | 45 | #include <linux/init.h> |
| 46 | #include <linux/errno.h> | 46 | #include <linux/errno.h> |
| 47 | #include <linux/string.h> | ||
| 47 | #include <linux/mtd/mtd.h> | 48 | #include <linux/mtd/mtd.h> |
| 48 | #ifdef HAVE_PARTITIONS | 49 | #ifdef HAVE_PARTITIONS |
| 49 | #include <linux/mtd/partitions.h> | 50 | #include <linux/mtd/partitions.h> |
diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c index a423a382095a..765c0179c8df 100644 --- a/drivers/mtd/devices/phram.c +++ b/drivers/mtd/devices/phram.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/list.h> | 22 | #include <linux/list.h> |
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/moduleparam.h> | 24 | #include <linux/moduleparam.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/mtd/mtd.h> | 26 | #include <linux/mtd/mtd.h> |
| 26 | 27 | ||
| 27 | #define ERROR(fmt, args...) printk(KERN_ERR "phram: " fmt , ## args) | 28 | #define ERROR(fmt, args...) printk(KERN_ERR "phram: " fmt , ## args) |