diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /drivers/s390/block/xpram.c | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/s390/block/xpram.c')
| -rw-r--r-- | drivers/s390/block/xpram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c index 118de392af63..c881a14fa5dd 100644 --- a/drivers/s390/block/xpram.c +++ b/drivers/s390/block/xpram.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <linux/ctype.h> /* isdigit, isxdigit */ | 33 | #include <linux/ctype.h> /* isdigit, isxdigit */ |
| 34 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
| 35 | #include <linux/init.h> | 35 | #include <linux/init.h> |
| 36 | #include <linux/slab.h> | ||
| 37 | #include <linux/blkdev.h> | 36 | #include <linux/blkdev.h> |
| 38 | #include <linux/blkpg.h> | 37 | #include <linux/blkpg.h> |
| 39 | #include <linux/hdreg.h> /* HDIO_GETGEO */ | 38 | #include <linux/hdreg.h> /* HDIO_GETGEO */ |
| @@ -41,6 +40,7 @@ | |||
| 41 | #include <linux/bio.h> | 40 | #include <linux/bio.h> |
| 42 | #include <linux/suspend.h> | 41 | #include <linux/suspend.h> |
| 43 | #include <linux/platform_device.h> | 42 | #include <linux/platform_device.h> |
| 43 | #include <linux/gfp.h> | ||
| 44 | #include <asm/uaccess.h> | 44 | #include <asm/uaccess.h> |
| 45 | 45 | ||
| 46 | #define XPRAM_NAME "xpram" | 46 | #define XPRAM_NAME "xpram" |