diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/linux/ide.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'include/linux/ide.h')
| -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> |