diff options
Diffstat (limited to 'drivers/staging/vme/devices')
| -rw-r--r-- | drivers/staging/vme/devices/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/staging/vme/devices/vme_pio2_cntr.c | 2 | ||||
| -rw-r--r-- | drivers/staging/vme/devices/vme_pio2_core.c | 2 | ||||
| -rw-r--r-- | drivers/staging/vme/devices/vme_pio2_gpio.c | 2 | ||||
| -rw-r--r-- | drivers/staging/vme/devices/vme_user.c | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/drivers/staging/vme/devices/Kconfig b/drivers/staging/vme/devices/Kconfig index 55ec30c..d0cab17 100644 --- a/drivers/staging/vme/devices/Kconfig +++ b/drivers/staging/vme/devices/Kconfig @@ -2,6 +2,7 @@ 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 @@ -9,7 +10,7 @@ config VME_USER 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/drivers/staging/vme/devices/vme_pio2_cntr.c b/drivers/staging/vme/devices/vme_pio2_cntr.c index 08e0d59..6335471 100644 --- a/drivers/staging/vme/devices/vme_pio2_cntr.c +++ b/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/drivers/staging/vme/devices/vme_pio2_core.c b/drivers/staging/vme/devices/vme_pio2_core.c index d476b2e..78228d4 100644 --- a/drivers/staging/vme/devices/vme_pio2_core.c +++ b/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/drivers/staging/vme/devices/vme_pio2_gpio.c b/drivers/staging/vme/devices/vme_pio2_gpio.c index 9c459c1..ad76a47 100644 --- a/drivers/staging/vme/devices/vme_pio2_gpio.c +++ b/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/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c index 10269d5..e24a6f9 100644 --- a/drivers/staging/vme/devices/vme_user.c +++ b/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); |
