aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/misc/mic/card/mic_debugfs.c2
-rw-r--r--drivers/misc/mic/card/mic_device.c2
-rw-r--r--drivers/misc/mic/card/mic_virtio.c2
-rw-r--r--drivers/misc/mic/card/mic_x100.c2
-rw-r--r--drivers/misc/mic/common/mic_dev.h (renamed from drivers/misc/mic/common/mic_device.h)4
-rw-r--r--drivers/misc/mic/host/mic_boot.c2
-rw-r--r--drivers/misc/mic/host/mic_debugfs.c2
-rw-r--r--drivers/misc/mic/host/mic_fops.c2
-rw-r--r--drivers/misc/mic/host/mic_intr.c2
-rw-r--r--drivers/misc/mic/host/mic_main.c2
-rw-r--r--drivers/misc/mic/host/mic_smpt.c2
-rw-r--r--drivers/misc/mic/host/mic_sysfs.c2
-rw-r--r--drivers/misc/mic/host/mic_virtio.c2
-rw-r--r--drivers/misc/mic/host/mic_x100.c2
14 files changed, 15 insertions, 15 deletions
diff --git a/drivers/misc/mic/card/mic_debugfs.c b/drivers/misc/mic/card/mic_debugfs.c
index 95cf186ff73a..421b3d7911df 100644
--- a/drivers/misc/mic/card/mic_debugfs.c
+++ b/drivers/misc/mic/card/mic_debugfs.c
@@ -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 */
diff --git a/drivers/misc/mic/card/mic_device.c b/drivers/misc/mic/card/mic_device.c
index 4125217579af..175d11425636 100644
--- a/drivers/misc/mic/card/mic_device.c
+++ b/drivers/misc/mic/card/mic_device.c
@@ -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"
diff --git a/drivers/misc/mic/card/mic_virtio.c b/drivers/misc/mic/card/mic_virtio.c
index 38275c1b9e03..7420c33d8f65 100644
--- a/drivers/misc/mic/card/mic_virtio.c
+++ b/drivers/misc/mic/card/mic_virtio.c
@@ -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
diff --git a/drivers/misc/mic/card/mic_x100.c b/drivers/misc/mic/card/mic_x100.c
index 7cb3469cf684..f491c9163bb2 100644
--- a/drivers/misc/mic/card/mic_x100.c
+++ b/drivers/misc/mic/card/mic_x100.c
@@ -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"
diff --git a/drivers/misc/mic/common/mic_device.h b/drivers/misc/mic/common/mic_dev.h
index 01eb74faae6b..92999c2bbf82 100644
--- a/drivers/misc/mic/common/mic_device.h
+++ b/drivers/misc/mic/common/mic_dev.h
@@ -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
diff --git a/drivers/misc/mic/host/mic_boot.c b/drivers/misc/mic/host/mic_boot.c
index fd9ff6d3784e..60c54d5c43c2 100644
--- a/drivers/misc/mic/host/mic_boot.c
+++ b/drivers/misc/mic/host/mic_boot.c
@@ -22,7 +22,7 @@
#include <linux/firmware.h>
#include <linux/mic_common.h>
-#include "../common/mic_device.h"
+#include "../common/mic_dev.h"
#include "mic_device.h"
#include "mic_smpt.h"
#include "mic_virtio.h"
diff --git a/drivers/misc/mic/host/mic_debugfs.c b/drivers/misc/mic/host/mic_debugfs.c
index e22fb7bbbb98..98a61b4319f4 100644
--- a/drivers/misc/mic/host/mic_debugfs.c
+++ b/drivers/misc/mic/host/mic_debugfs.c
@@ -23,7 +23,7 @@
#include <linux/seq_file.h>
#include <linux/mic_common.h>
-#include "../common/mic_device.h"
+#include "../common/mic_dev.h"
#include "mic_device.h"
#include "mic_smpt.h"
#include "mic_virtio.h"
diff --git a/drivers/misc/mic/host/mic_fops.c b/drivers/misc/mic/host/mic_fops.c
index 661469ad339d..e699c80a8c0a 100644
--- a/drivers/misc/mic/host/mic_fops.c
+++ b/drivers/misc/mic/host/mic_fops.c
@@ -21,7 +21,7 @@
#include <linux/poll.h>
#include <linux/mic_common.h>
-#include "../common/mic_device.h"
+#include "../common/mic_dev.h"
#include "mic_device.h"
#include "mic_fops.h"
#include "mic_virtio.h"
diff --git a/drivers/misc/mic/host/mic_intr.c b/drivers/misc/mic/host/mic_intr.c
index cdae3141dbb9..71a7521cf1a4 100644
--- a/drivers/misc/mic/host/mic_intr.c
+++ b/drivers/misc/mic/host/mic_intr.c
@@ -21,7 +21,7 @@
#include <linux/pci.h>
#include <linux/interrupt.h>
-#include "../common/mic_device.h"
+#include "../common/mic_dev.h"
#include "mic_device.h"
/*
diff --git a/drivers/misc/mic/host/mic_main.c b/drivers/misc/mic/host/mic_main.c
index a8965d496e84..ca06aa9b7114 100644
--- a/drivers/misc/mic/host/mic_main.c
+++ b/drivers/misc/mic/host/mic_main.c
@@ -28,7 +28,7 @@
#include <linux/poll.h>
#include <linux/mic_common.h>
-#include "../common/mic_device.h"
+#include "../common/mic_dev.h"
#include "mic_device.h"
#include "mic_x100.h"
#include "mic_smpt.h"
diff --git a/drivers/misc/mic/host/mic_smpt.c b/drivers/misc/mic/host/mic_smpt.c
index a3462076bc57..003d02b212be 100644
--- a/drivers/misc/mic/host/mic_smpt.c
+++ b/drivers/misc/mic/host/mic_smpt.c
@@ -20,7 +20,7 @@
*/
#include <linux/pci.h>
-#include "../common/mic_device.h"
+#include "../common/mic_dev.h"
#include "mic_device.h"
#include "mic_smpt.h"
diff --git a/drivers/misc/mic/host/mic_sysfs.c b/drivers/misc/mic/host/mic_sysfs.c
index bebbae2fa9f8..029a4f31bee7 100644
--- a/drivers/misc/mic/host/mic_sysfs.c
+++ b/drivers/misc/mic/host/mic_sysfs.c
@@ -21,7 +21,7 @@
#include <linux/pci.h>
#include <linux/mic_common.h>
-#include "../common/mic_device.h"
+#include "../common/mic_dev.h"
#include "mic_device.h"
/*
diff --git a/drivers/misc/mic/host/mic_virtio.c b/drivers/misc/mic/host/mic_virtio.c
index be2a1f06c4ca..9e0456fb1ea8 100644
--- a/drivers/misc/mic/host/mic_virtio.c
+++ b/drivers/misc/mic/host/mic_virtio.c
@@ -23,7 +23,7 @@
#include <linux/uaccess.h>
#include <linux/mic_common.h>
-#include "../common/mic_device.h"
+#include "../common/mic_dev.h"
#include "mic_device.h"
#include "mic_smpt.h"
#include "mic_virtio.h"
diff --git a/drivers/misc/mic/host/mic_x100.c b/drivers/misc/mic/host/mic_x100.c
index a12ae5c8844d..3a0d660bad4a 100644
--- a/drivers/misc/mic/host/mic_x100.c
+++ b/drivers/misc/mic/host/mic_x100.c
@@ -24,7 +24,7 @@
#include <linux/firmware.h>
#include <linux/delay.h>
-#include "../common/mic_device.h"
+#include "../common/mic_dev.h"
#include "mic_device.h"
#include "mic_x100.h"
#include "mic_smpt.h"

Privacy Policy