diff options
author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2010-05-16 19:40:56 -0300 |
---|---|---|
committer | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2010-05-16 19:40:56 -0300 |
commit | b65b34895437915f411882dd40d704eb0863ffb0 (patch) | |
tree | 3e9302ab09c9a9068fd8fd80708ef3a35b55e665 /drivers/ata/sata_qstor.c | |
parent | 88cc83772a3c7756b9f2b4ba835545ad90a08409 (diff) | |
parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
download | lwn-b65b34895437915f411882dd40d704eb0863ffb0.tar.gz lwn-b65b34895437915f411882dd40d704eb0863ffb0.zip |
Merge mainline (v2.6.34-rc7)
Diffstat (limited to 'drivers/ata/sata_qstor.c')
-rw-r--r-- | drivers/ata/sata_qstor.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c index 326c0cfc29b3..92ba45e6689b 100644 --- a/drivers/ata/sata_qstor.c +++ b/drivers/ata/sata_qstor.c @@ -29,6 +29,7 @@ #include <linux/kernel.h> #include <linux/module.h> +#include <linux/gfp.h> #include <linux/pci.h> #include <linux/init.h> #include <linux/blkdev.h> |