Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3308ee8f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 13293115 61eae5bb

drivers/ide/ide-cd_verbose.c

+2 −0
Original line number Diff line number Diff line
@@ -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,

drivers/ide/ide-pio-blacklist.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */



#include <linux/string.h>

#include <linux/ide.h>



static struct ide_pio_info {

	const char	*name;