diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 01:08:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 01:08:32 -0400 |
| commit | d798f7f080805ad7e15fc37a43d8c6f91edb6dda (patch) | |
| tree | 73e3783cb619d3a5dc40a5f32859f063b5cd0664 /include | |
| parent | e98bae7592a44bdce2e49ccd64f3c7ffe244a0f6 (diff) | |
| parent | db210f824c2f155703edf03bc2137da1bd76e27d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
ide/ide-scan-pci.c: Use for_each_pci_dev().
ide: Use linux/mutex.h
IDE: ide-floppy, remove unnecessary NULL check
drivers/ide/pmac.c: Remove unnecessary casts of pci_get_drvdata
ide: fix use after free in ide-acpi
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ide.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 072fe8c93e6f..42557851b12e 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
| @@ -18,13 +18,13 @@ | |||
| 18 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
| 19 | #include <linux/completion.h> | 19 | #include <linux/completion.h> |
| 20 | #include <linux/pm.h> | 20 | #include <linux/pm.h> |
| 21 | #include <linux/mutex.h> | ||
| 21 | #ifdef CONFIG_BLK_DEV_IDEACPI | 22 | #ifdef CONFIG_BLK_DEV_IDEACPI |
| 22 | #include <acpi/acpi.h> | 23 | #include <acpi/acpi.h> |
| 23 | #endif | 24 | #endif |
| 24 | #include <asm/byteorder.h> | 25 | #include <asm/byteorder.h> |
| 25 | #include <asm/system.h> | 26 | #include <asm/system.h> |
| 26 | #include <asm/io.h> | 27 | #include <asm/io.h> |
| 27 | #include <asm/mutex.h> | ||
| 28 | 28 | ||
| 29 | /* for request_sense */ | 29 | /* for request_sense */ |
| 30 | #include <linux/cdrom.h> | 30 | #include <linux/cdrom.h> |