openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2014-01-29 18:07:15 -08:00
parent 13293115d1 61eae5bb06
commit 3308ee8f45
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ide/ide-cd_verbose.c
View File

@ -9,7 +9,9 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/cdrom.h> #include <linux/cdrom.h>
#include <linux/ide.h>
#include <scsi/scsi.h> #include <scsi/scsi.h>
#include "ide-cd.h"
#ifndef CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS #ifndef CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS
void ide_cd_log_error(const char *name, struct request *failed_command, void ide_cd_log_error(const char *name, struct request *failed_command,

1
drivers/ide/ide-pio-blacklist.c
View File

@ -7,6 +7,7 @@
*/ */
#include <linux/string.h> #include <linux/string.h>
#include <linux/ide.h>
static struct ide_pio_info { static struct ide_pio_info {
const char *name; const char *name;