diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:35:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:36:16 -0400 |
| commit | b257c14ceb1194a6181144210056d38f22127189 (patch) | |
| tree | c803925f1d5bf2237e7495d306bf43929df0c952 /drivers/ata/ata_piix.c | |
| parent | 371fd7e7a56a5c136d31aa980011bd2f131c3ef5 (diff) | |
| parent | 2ba3abd8186f24c7fb418927025b4e2120e3a362 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: merge the latest fixes, update to -rc4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 c33806654e46..83bc49fac9bb 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> |