diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-30 17:22:22 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-30 17:26:41 +1100 |
| commit | ef9ea503472da2992fcde8954ec3445d450d2781 (patch) | |
| tree | d2ed39ac34f23090ae7cd8819bfc82d238d62d17 /drivers/ata/sata_nv.c | |
| parent | fb260b23c0a9225c93e8892280c6d73797a3cecc (diff) | |
| parent | 8b2fe80f5a68b2ebcb0d83f09b94e0890fd8e0b5 (diff) | |
Merge remote branch 'slabh/slabh'
Conflicts:
drivers/char/sysrq.c
drivers/gpu/drm/radeon/r300.c
drivers/hid/hid-wacom.c
drivers/media/video/soc_camera.c
drivers/net/wireless/wl12xx/wl1271_cmd.c
drivers/net/wireless/wl12xx/wl1271_main.c
drivers/net/wireless/wl12xx/wl1271_spi.c
drivers/pcmcia/pcmcia_resource.c
drivers/s390/char/vmcp.c
drivers/staging/cx25821/cx25821-audio-upstream.c
fs/9p/vfs_super.c
include/linux/percpu.h
kernel/audit_watch.c
net/mac80211/scan.c
sound/soc/codecs/ad1938.c
Diffstat (limited to 'drivers/ata/sata_nv.c')
| -rw-r--r-- | drivers/ata/sata_nv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index 684fe04dbbb7..2a98b09ab735 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c @@ -38,6 +38,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> |