diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-10-20 16:07:19 +0100 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-20 16:07:19 +0100 |
| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /drivers/block/aoe/aoemain.c | |
| parent | c15895ef30c2c03e99802951787183039a349d32 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
Diffstat (limited to 'drivers/block/aoe/aoemain.c')
| -rw-r--r-- | drivers/block/aoe/aoemain.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/aoe/aoemain.c b/drivers/block/aoe/aoemain.c index 7b15a5e9cec..7f83ad90e76 100644 --- a/drivers/block/aoe/aoemain.c +++ b/drivers/block/aoe/aoemain.c @@ -7,6 +7,7 @@ #include <linux/hdreg.h> #include <linux/blkdev.h> #include <linux/module.h> +#include <linux/skbuff.h> #include "aoe.h" MODULE_LICENSE("GPL"); |