diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-11 16:01:06 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-11 16:01:06 -0700 |
commit | dc8a7b11aa68d6795a46e0a42ce92220d1a6f0cd (patch) | |
tree | 7b353684090d23b1e2e3f85bf83df491f04dcc8a /drivers/block/viodasd.c | |
parent | d291676ce8bc1d8ef93488023d04027010596de3 (diff) | |
parent | 02a5e0acb3cb85d80d0fe834e366d38a92bbaa22 (diff) |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
BLOCK: Hide the contents of linux/bio.h if CONFIG_BLOCK=n
sysace: HDIO_GETGEO has it's own method for ages
drivers/block/cpqarray.c: better error handling and kmalloc + memset conversion to k[cz]alloc
drivers/block/cciss.c: kmalloc + memset conversion to kzalloc
Clean up duplicate includes in drivers/block/
Fix remap handling by blktrace
[PATCH] remove mm/filemap.c:file_send_actor()
Diffstat (limited to 'drivers/block/viodasd.c')
-rw-r--r-- | drivers/block/viodasd.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c index 85916e2665d..af3969a9c96 100644 --- a/drivers/block/viodasd.c +++ b/drivers/block/viodasd.c @@ -41,7 +41,6 @@ #include <linux/dma-mapping.h> #include <linux/completion.h> #include <linux/device.h> -#include <linux/kernel.h> #include <asm/uaccess.h> #include <asm/vio.h> |