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

Commit 4aa79961 authored by Sudeep Dutt's avatar Sudeep Dutt Committed by Greg Kroah-Hartman
Browse files

misc: mic: header file cleanups. 

Dont use same name for header files in different folders.

These changes were suggested by Greg Kroah-Hartman during the
code review @ https://lkml.org/lkml/2013/9/6/18



Reported-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarAshutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: default avatarDasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Signed-off-by: default avatarNikhil Rao <nikhil.rao@intel.com>
Signed-off-by: default avatarHarshavardhan R Kharche <harshavardhan.r.kharche@intel.com>
Signed-off-by: default avatarSudeep Dutt <sudeep.dutt@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2ce58528

drivers/misc/mic/card/mic_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <linux/interrupt.h>

#include <linux/device.h>



#include "../common/mic_device.h"

#include "../common/mic_dev.h"

#include "mic_device.h"



/* Debugfs parent dir */

drivers/misc/mic/card/mic_device.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <linux/reboot.h>



#include <linux/mic_common.h>

#include "../common/mic_device.h"

#include "../common/mic_dev.h"

#include "mic_device.h"

#include "mic_virtio.h"

drivers/misc/mic/card/mic_virtio.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include <linux/slab.h>

#include <linux/virtio_config.h>



#include "../common/mic_device.h"

#include "../common/mic_dev.h"

#include "mic_virtio.h"



#define VIRTIO_SUBCODE_64 0x0D00

drivers/misc/mic/card/mic_x100.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <linux/pci.h>

#include <linux/platform_device.h>



#include "../common/mic_device.h"

#include "../common/mic_dev.h"

#include "mic_device.h"

#include "mic_x100.h"

drivers/misc/mic/common/mic_device.h→drivers/misc/mic/common/mic_dev.h

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
 * Intel MIC driver.

 *

 */

#ifndef __MIC_COMMON_DEVICE_H_

#define __MIC_COMMON_DEVICE_H_

#ifndef __MIC_DEV_H__

#define __MIC_DEV_H__



/**

 * struct mic_mw - MIC memory window