diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-30 06:07:15 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-30 06:07:15 +0400 |
| commit | 3308ee8f4582f97d1c08864dd06f7291aea323e5 (patch) | |
| tree | aa58ea6357b174633706e75aa94ddf4d882a7824 | |
| parent | 13293115d1c44df1077976473112d18f1877c390 (diff) | |
| parent | 61eae5bb06496a6633ba000a1d7546b494e00081 (diff) | |
| download | linux-3308ee8f4582f97d1c08864dd06f7291aea323e5.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
Pull IDE fixes from David Miller:
"Two header file inclusion fixes from Rashika Kheria"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
drivers: ide: Include appropriate header file in ide-pio-blacklist.c
drivers: ide: Include appropriate header file in ide-cd_verbose.c
| -rw-r--r-- | drivers/ide/ide-cd_verbose.c | 2 | ||||
| -rw-r--r-- | drivers/ide/ide-pio-blacklist.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ide/ide-cd_verbose.c b/drivers/ide/ide-cd_verbose.c index 6490a2dea96b..f079ca2f260b 100644 --- a/drivers/ide/ide-cd_verbose.c +++ b/drivers/ide/ide-cd_verbose.c @@ -9,7 +9,9 @@ #include <linux/kernel.h> #include <linux/blkdev.h> #include <linux/cdrom.h> +#include <linux/ide.h> #include <scsi/scsi.h> +#include "ide-cd.h" #ifndef CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS void ide_cd_log_error(const char *name, struct request *failed_command, diff --git a/drivers/ide/ide-pio-blacklist.c b/drivers/ide/ide-pio-blacklist.c index a8c2c8f8660a..40e683a84ff9 100644 --- a/drivers/ide/ide-pio-blacklist.c +++ b/drivers/ide/ide-pio-blacklist.c @@ -7,6 +7,7 @@ */ #include <linux/string.h> +#include <linux/ide.h> static struct ide_pio_info { const char *name; |