diff options
| author | Jiri Kosina | 2010-05-03 15:25:35 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2010-05-03 15:25:35 +0200 |
| commit | d6d53cbc6b10d28646fb6184d1069f336ec76dc4 (patch) | |
| tree | 1c844b3ce8bd430becbbb74875898b08d9f89bb5 /drivers/mmc/card/block.c | |
| parent | HID: split picolcd's operation_mode sysfs attribute (diff) | |
| parent | HID: add suspend/resume hooks for hid drivers (diff) | |
| download | kernel-qcow2-linux-d6d53cbc6b10d28646fb6184d1069f336ec76dc4.tar.gz kernel-qcow2-linux-d6d53cbc6b10d28646fb6184d1069f336ec76dc4.tar.xz kernel-qcow2-linux-d6d53cbc6b10d28646fb6184d1069f336ec76dc4.zip | |
Merge branch 'hid-suspend' into picolcd
Diffstat (limited to 'drivers/mmc/card/block.c')
| -rw-r--r-- | drivers/mmc/card/block.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 1f552c6e7579..cb9fbc83b090 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -23,6 +23,7 @@ #include <linux/kernel.h> #include <linux/fs.h> +#include <linux/slab.h> #include <linux/errno.h> #include <linux/hdreg.h> #include <linux/kdev_t.h> |