From 91ef6be84663c509e706172df82d988a7cb365cd Mon Sep 17 00:00:00 2001 From: Manohar Vanga Date: Mon, 26 Sep 2011 11:27:18 +0200 Subject: [PATCH] --- yaml --- r: 268839 b: refs/heads/master c: 0a4b6b0279d903df2d62aaf92edf360fb5312532 h: refs/heads/master i: 268837: 5d57804ce40505cc709e6b145ca213f8a5e40663 268835: a506a21c9de15216797a74d416b495300e178667 268831: 14f2b89800fa0c14817a89a96ffb58316dbc3532 v: v3 --- [refs] | 2 +- trunk/drivers/staging/vme/devices/vme_user.c | 10 +++++----- trunk/drivers/staging/vme/devices/vme_user.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 8d06e1b1b659..0beebfd4f3f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a916a391d3e19593a104a8c3c4779a3084f1ca5b +refs/heads/master: 0a4b6b0279d903df2d62aaf92edf360fb5312532 diff --git a/trunk/drivers/staging/vme/devices/vme_user.c b/trunk/drivers/staging/vme/devices/vme_user.c index 9518dda13ea6..7dcd1622b5f5 100644 --- a/trunk/drivers/staging/vme/devices/vme_user.c +++ b/trunk/drivers/staging/vme/devices/vme_user.c @@ -43,7 +43,7 @@ static DEFINE_MUTEX(vme_user_mutex); static const char driver_name[] = "vme_user"; -static int bus[USER_BUS_MAX]; +static int bus[VME_USER_BUS_MAX]; static unsigned int bus_num; /* Currently Documentation/devices.txt defines the following for VME: @@ -643,10 +643,10 @@ static int __init vme_user_init(void) /* Let's start by supporting one bus, we can support more than one * in future revisions if that ever becomes necessary. */ - if (bus_num > USER_BUS_MAX) { + if (bus_num > VME_USER_BUS_MAX) { printk(KERN_ERR "%s: Driver only able to handle %d buses\n", - driver_name, USER_BUS_MAX); - bus_num = USER_BUS_MAX; + driver_name, VME_USER_BUS_MAX); + bus_num = VME_USER_BUS_MAX; } /* @@ -668,7 +668,7 @@ static int __init vme_user_init(void) static int vme_user_match(struct vme_dev *vdev) { - if (vdev->num >= USER_BUS_MAX) + if (vdev->num >= VME_USER_BUS_MAX) return 0; return 1; } diff --git a/trunk/drivers/staging/vme/devices/vme_user.h b/trunk/drivers/staging/vme/devices/vme_user.h index 24bf4e54013d..d85a1e9dbe3a 100644 --- a/trunk/drivers/staging/vme/devices/vme_user.h +++ b/trunk/drivers/staging/vme/devices/vme_user.h @@ -1,7 +1,7 @@ #ifndef _VME_USER_H_ #define _VME_USER_H_ -#define USER_BUS_MAX 1 +#define VME_USER_BUS_MAX 1 /* * VMEbus Master Window Configuration Structure