diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 15:25:35 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 15:25:35 +0200 |
commit | d6d53cbc6b10d28646fb6184d1069f336ec76dc4 (patch) | |
tree | 1c844b3ce8bd430becbbb74875898b08d9f89bb5 /drivers/ide/ide-dma.c | |
parent | HID: split picolcd's operation_mode sysfs attribute (diff) | |
parent | HID: add suspend/resume hooks for hid drivers (diff) | |
download | linux-dev-d6d53cbc6b10d28646fb6184d1069f336ec76dc4.tar.xz linux-dev-d6d53cbc6b10d28646fb6184d1069f336ec76dc4.zip |
Merge branch 'hid-suspend' into picolcd
Diffstat (limited to 'drivers/ide/ide-dma.c')
-rw-r--r-- | drivers/ide/ide-dma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index ee58c88dee5a..2c17e3fb43e3 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c @@ -29,6 +29,7 @@ */ #include <linux/types.h> +#include <linux/gfp.h> #include <linux/kernel.h> #include <linux/ide.h> #include <linux/scatterlist.h> |