aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@jak-linux.org>2011-09-27 19:01:06 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-09-29 17:41:39 -0700
commit12b5a55d725579d0978da67f26577224a1c40640 (patch)
treee49e53380c6b641a1a29c32392acafba77070abe
parentb812538234397adf170ba4e218d35c8e5d0604fd (diff)
staging: nvec: Add missing includes and reorder them
Add the includes that are currently missing in nvec.h and nvec.c and reorder them alphabetically. Signed-off-by: Julian Andres Klode <jak@jak-linux.org> Acked-by: Marc Dietrich <marvin24@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/nvec/nvec.c24
-rw-r--r--drivers/staging/nvec/nvec.h7
2 files changed, 17 insertions, 14 deletions
diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c
index a80f9935a3e..89153446b37 100644
--- a/drivers/staging/nvec/nvec.c
+++ b/drivers/staging/nvec/nvec.c
@@ -16,29 +16,27 @@
/* #define DEBUG */
-#include <asm/irq.h>
-
+#include <linux/kernel.h>
#include <linux/atomic.h>
+#include <linux/clk.h>
#include <linux/completion.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/gpio.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/irq.h>
-#include <linux/slab.h>
-#include <linux/gpio.h>
-#include <linux/serio.h>
-#include <linux/delay.h>
-#include <linux/input.h>
-#include <linux/workqueue.h>
-#include <linux/clk.h>
-
-#include <linux/semaphore.h>
#include <linux/list.h>
+#include <linux/mfd/core.h>
+#include <linux/mutex.h>
#include <linux/notifier.h>
#include <linux/platform_device.h>
-#include <linux/mfd/core.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/workqueue.h>
-#include <mach/iomap.h>
#include <mach/clk.h>
+#include <mach/iomap.h>
#include "nvec.h"
diff --git a/drivers/staging/nvec/nvec.h b/drivers/staging/nvec/nvec.h
index f8ffe0002d1..a4c17b0e10c 100644
--- a/drivers/staging/nvec/nvec.h
+++ b/drivers/staging/nvec/nvec.h
@@ -18,8 +18,13 @@
#define __LINUX_MFD_NVEC
#include <linux/atomic.h>
+#include <linux/clk.h>
+#include <linux/completion.h>
+#include <linux/list.h>
+#include <linux/mutex.h>
#include <linux/notifier.h>
-#include <linux/semaphore.h>
+#include <linux/spinlock.h>
+#include <linux/workqueue.h>
/* NVEC_POOL_SIZE - Size of the pool in &struct nvec_msg */
#define NVEC_POOL_SIZE 64