---

yaml --- r: 304484 b: refs/heads/master c: db3b9e9 h: refs/heads/master v: v3
git-mirror · Apr 26, 2012 · 5877158 · 5877158
1 parent 6ad223d
commit 5877158
Show file tree

Hide file tree

Showing 27 changed files with 23 additions and 26 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8176df8e95df4c867457076190cfb18f2d7ff18c
+refs/heads/master: db3b9e990e75573402cda22faf933760f076c033
diff --git a/trunk/drivers/Kconfig b/trunk/drivers/Kconfig
@@ -142,4 +142,6 @@ source "drivers/devfreq/Kconfig"
 
 source "drivers/iio/Kconfig"
 
+source "drivers/vme/Kconfig"
+
 endmenu
diff --git a/trunk/drivers/Makefile b/trunk/drivers/Makefile
@@ -135,3 +135,4 @@ obj-$(CONFIG_HYPERV)		+= hv/
 
 obj-$(CONFIG_PM_DEVFREQ)	+= devfreq/
 obj-$(CONFIG_IIO)		+= iio/
+obj-$(CONFIG_VME_BUS)		+= vme/
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
@@ -72,8 +72,6 @@ source "drivers/staging/vt6655/Kconfig"
 
 source "drivers/staging/vt6656/Kconfig"
 
-source "drivers/staging/vme/Kconfig"
-
 source "drivers/staging/sep/Kconfig"
 
 source "drivers/staging/iio/Kconfig"

diff --git a/trunk/drivers/staging/vme/Makefile b/trunk/drivers/staging/vme/Makefile
@@ -1,8 +1 @@
-#
-# Makefile for the VME bridge device drivers.
-#
-obj-$(CONFIG_VME_BUS)		+= vme.o
-
-obj-y				+= bridges/
 obj-y				+= devices/
-obj-y				+= boards/
diff --git a/trunk/drivers/staging/vme/TODO b/trunk/drivers/staging/vme/TODO
diff --git a/trunk/drivers/staging/vme/devices/Kconfig b/trunk/drivers/staging/vme/devices/Kconfig
@@ -2,14 +2,15 @@ comment "VME Device Drivers"
 
 config VME_USER
 	tristate "VME user space access driver"
+	depends on STAGING
 	help
 	  If you say Y here you want to be able to access a limited number of
 	  VME windows in a manner at least semi-compatible with the interface
 	  provided with the original driver at http://vmelinux.org/.
 
 config VME_PIO2
 	tristate "GE PIO2 VME"
-	depends on GPIOLIB
+	depends on STAGING && GPIOLIB
 	help
 	  Say Y here to include support for the GE PIO2. The PIO2 is a 6U VME
 	  slave card, implementing 32 solid-state relay switched IO lines, in

diff --git a/trunk/drivers/staging/vme/devices/vme_pio2_cntr.c b/trunk/drivers/staging/vme/devices/vme_pio2_cntr.c
@@ -17,8 +17,8 @@
 #include <linux/device.h>
 #include <linux/types.h>
 #include <linux/gpio.h>
+#include <linux/vme.h>
 
-#include "../vme.h"
 #include "vme_pio2.h"
 
 static int pio2_cntr_irq_set(struct pio2_card *card, int id)

diff --git a/trunk/drivers/staging/vme/devices/vme_pio2_core.c b/trunk/drivers/staging/vme/devices/vme_pio2_core.c
@@ -19,8 +19,8 @@
 #include <linux/ctype.h>
 #include <linux/gpio.h>
 #include <linux/slab.h>
+#include <linux/vme.h>
 
-#include "../vme.h"
 #include "vme_pio2.h"
 
 

diff --git a/trunk/drivers/staging/vme/devices/vme_pio2_gpio.c b/trunk/drivers/staging/vme/devices/vme_pio2_gpio.c
@@ -20,8 +20,8 @@
 #include <linux/ctype.h>
 #include <linux/gpio.h>
 #include <linux/slab.h>
+#include <linux/vme.h>
 
-#include "../vme.h"
 #include "vme_pio2.h"
 
 static const char driver_name[] = "pio2_gpio";

diff --git a/trunk/drivers/staging/vme/devices/vme_user.c b/trunk/drivers/staging/vme/devices/vme_user.c
@@ -36,8 +36,8 @@
 
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/vme.h>
 
-#include "../vme.h"
 #include "vme_user.h"
 
 static DEFINE_MUTEX(vme_user_mutex);

diff --git a/trunk/drivers/staging/vme/Kconfig → trunk/drivers/vme/Kconfig b/trunk/drivers/staging/vme/Kconfig → trunk/drivers/vme/Kconfig
@@ -10,10 +10,10 @@ menuconfig VME_BUS
 
 if VME_BUS
 
-source "drivers/staging/vme/bridges/Kconfig"
+source "drivers/vme/bridges/Kconfig"
 
-source "drivers/staging/vme/devices/Kconfig"
+source "drivers/vme/boards/Kconfig"
 
-source "drivers/staging/vme/boards/Kconfig"
+source "drivers/staging/vme/devices/Kconfig"
 
 endif # VME
diff --git a/trunk/drivers/vme/Makefile b/trunk/drivers/vme/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the VME bridge device drivers.
+#
+obj-$(CONFIG_VME_BUS)		+= vme.o
+
+obj-y				+= bridges/
+obj-y				+= boards/
diff --git a/trunk/drivers/staging/vme/boards/Kconfig → trunk/drivers/vme/boards/Kconfig b/trunk/drivers/staging/vme/boards/Kconfig → trunk/drivers/vme/boards/Kconfig
diff --git a/trunk/drivers/staging/vme/boards/Makefile → trunk/drivers/vme/boards/Makefile b/trunk/drivers/staging/vme/boards/Makefile → trunk/drivers/vme/boards/Makefile
diff --git a/...ivers/staging/vme/boards/vme_vmivme7805.c → trunk/drivers/vme/boards/vme_vmivme7805.c b/...ivers/staging/vme/boards/vme_vmivme7805.c → trunk/drivers/vme/boards/vme_vmivme7805.c
diff --git a/...ivers/staging/vme/boards/vme_vmivme7805.h → trunk/drivers/vme/boards/vme_vmivme7805.h b/...ivers/staging/vme/boards/vme_vmivme7805.h → trunk/drivers/vme/boards/vme_vmivme7805.h
diff --git a/trunk/drivers/staging/vme/bridges/Kconfig → trunk/drivers/vme/bridges/Kconfig b/trunk/drivers/staging/vme/bridges/Kconfig → trunk/drivers/vme/bridges/Kconfig
diff --git a/trunk/drivers/staging/vme/bridges/Makefile → trunk/drivers/vme/bridges/Makefile b/trunk/drivers/staging/vme/bridges/Makefile → trunk/drivers/vme/bridges/Makefile
diff --git a/...rivers/staging/vme/bridges/vme_ca91cx42.c → trunk/drivers/vme/bridges/vme_ca91cx42.c b/...rivers/staging/vme/bridges/vme_ca91cx42.c → trunk/drivers/vme/bridges/vme_ca91cx42.c
@@ -29,8 +29,8 @@
 #include <linux/time.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/vme.h>
 
-#include "../vme.h"
 #include "../vme_bridge.h"
 #include "vme_ca91cx42.h"
 

diff --git a/...rivers/staging/vme/bridges/vme_ca91cx42.h → trunk/drivers/vme/bridges/vme_ca91cx42.h b/...rivers/staging/vme/bridges/vme_ca91cx42.h → trunk/drivers/vme/bridges/vme_ca91cx42.h
diff --git a/.../drivers/staging/vme/bridges/vme_tsi148.c → trunk/drivers/vme/bridges/vme_tsi148.c b/.../drivers/staging/vme/bridges/vme_tsi148.c → trunk/drivers/vme/bridges/vme_tsi148.c
@@ -30,8 +30,8 @@
 #include <linux/io.h>
 #include <linux/uaccess.h>
 #include <linux/byteorder/generic.h>
+#include <linux/vme.h>
 
-#include "../vme.h"
 #include "../vme_bridge.h"
 #include "vme_tsi148.h"
 

diff --git a/.../drivers/staging/vme/bridges/vme_tsi148.h → trunk/drivers/vme/bridges/vme_tsi148.h b/.../drivers/staging/vme/bridges/vme_tsi148.h → trunk/drivers/vme/bridges/vme_tsi148.h
diff --git a/trunk/drivers/staging/vme/vme.c → trunk/drivers/vme/vme.c b/trunk/drivers/staging/vme/vme.c → trunk/drivers/vme/vme.c
@@ -30,8 +30,8 @@
 #include <linux/mutex.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
+#include <linux/vme.h>
 
-#include "vme.h"
 #include "vme_bridge.h"
 
 /* Bitmask and list of registered buses both protected by common mutex */

diff --git a/trunk/drivers/staging/vme/vme_api.txt → trunk/drivers/vme/vme_api.txt b/trunk/drivers/staging/vme/vme_api.txt → trunk/drivers/vme/vme_api.txt
diff --git a/trunk/drivers/staging/vme/vme_bridge.h → trunk/drivers/vme/vme_bridge.h b/trunk/drivers/staging/vme/vme_bridge.h → trunk/drivers/vme/vme_bridge.h
diff --git a/trunk/drivers/staging/vme/vme.h → trunk/include/linux/vme.h b/trunk/drivers/staging/vme/vme.h → trunk/include/linux/vme.h
Original file line number	Diff line number	Diff line change
Expand Up		@@ -142,4 +142,6 @@ source "drivers/devfreq/Kconfig"

		source "drivers/iio/Kconfig"

		source "drivers/vme/Kconfig"

		endmenu
Original file line number	Diff line number	Diff line change
Expand Up		@@ -135,3 +135,4 @@ obj-$(CONFIG_HYPERV) += hv/

		obj-$(CONFIG_PM_DEVFREQ) += devfreq/
		obj-$(CONFIG_IIO) += iio/
		obj-$(CONFIG_VME_BUS) += vme/