diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
| commit | 6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 (patch) | |
| tree | 797676a336b050bfa1ef879377c07e541b9075d6 /drivers/ata/ata_piix.c | |
| parent | 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f (diff) | |
| parent | c81eddb0e3728661d1585fbc564449c94165cc36 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/ata/ata_piix.c')
| -rw-r--r-- | drivers/ata/ata_piix.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index b1cb8af6af1c..ec52fc618763 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
| @@ -90,6 +90,7 @@ | |||
| 90 | #include <linux/blkdev.h> | 90 | #include <linux/blkdev.h> |
| 91 | #include <linux/delay.h> | 91 | #include <linux/delay.h> |
| 92 | #include <linux/device.h> | 92 | #include <linux/device.h> |
| 93 | #include <linux/gfp.h> | ||
| 93 | #include <scsi/scsi_host.h> | 94 | #include <scsi/scsi_host.h> |
| 94 | #include <linux/libata.h> | 95 | #include <linux/libata.h> |
| 95 | #include <linux/dmi.h> | 96 | #include <linux/dmi.h> |