diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2010-05-02 23:28:58 -0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2010-05-02 23:28:58 -0400 |
| commit | df2071bd081408318d659cd14a9cf6ff23d874c9 (patch) | |
| tree | b31291b5fd4b9f84c629833afbfaa8d431857475 /drivers/memstick | |
| parent | 97e3d94aac1c3e95bd04d1b186479a4df3663ab8 (diff) | |
| parent | be1066bbcd443a65df312fdecea7e4959adedb45 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/memstick')
| -rw-r--r-- | drivers/memstick/core/memstick.c | 1 | ||||
| -rw-r--r-- | drivers/memstick/core/mspro_block.c | 1 | ||||
| -rw-r--r-- | drivers/memstick/host/jmb38x_ms.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c index b3bf1c44d74d..c00fe8253c51 100644 --- a/drivers/memstick/core/memstick.c +++ b/drivers/memstick/core/memstick.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/idr.h> | 16 | #include <linux/idr.h> |
| 17 | #include <linux/fs.h> | 17 | #include <linux/fs.h> |
| 18 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | #define DRIVER_NAME "memstick" | 21 | #define DRIVER_NAME "memstick" |
| 21 | 22 | ||
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c index 972b87069d55..8327e248520a 100644 --- a/drivers/memstick/core/mspro_block.c +++ b/drivers/memstick/core/mspro_block.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/hdreg.h> | 17 | #include <linux/hdreg.h> |
| 18 | #include <linux/kthread.h> | 18 | #include <linux/kthread.h> |
| 19 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/memstick.h> | 21 | #include <linux/memstick.h> |
| 21 | 22 | ||
| 22 | #define DRIVER_NAME "mspro_block" | 23 | #define DRIVER_NAME "mspro_block" |
diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c index f4a162a4bece..f2b894cd8b02 100644 --- a/drivers/memstick/host/jmb38x_ms.c +++ b/drivers/memstick/host/jmb38x_ms.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
| 17 | #include <linux/highmem.h> | 17 | #include <linux/highmem.h> |
| 18 | #include <linux/memstick.h> | 18 | #include <linux/memstick.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | #define DRIVER_NAME "jmb38x_ms" | 21 | #define DRIVER_NAME "jmb38x_ms" |
| 21 | 22 | ||