git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
s390
/
scsi
/
zfcp_sysfs_driver.c
diff --git
a/drivers/s390/scsi/zfcp_sysfs_driver.c
b/drivers/s390/scsi/zfcp_sysfs_driver.c
index
988dcea
..
6622d55
100644
(file)
--- a/
drivers/s390/scsi/zfcp_sysfs_driver.c
+++ b/
drivers/s390/scsi/zfcp_sysfs_driver.c
@@
-10,6
+10,7
@@
* Authors:
* Martin Peschke <mpeschke@de.ibm.com>
* Heiko Carstens <heiko.carstens@de.ibm.com>
* Authors:
* Martin Peschke <mpeschke@de.ibm.com>
* Heiko Carstens <heiko.carstens@de.ibm.com>
+ * Andreas Herrmann <aherrman@de.ibm.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-26,11
+27,7
@@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#define ZFCP_SYSFS_DRIVER_C_REVISION "$Revision: 1.12 $"
-
-#include <asm/ccwdev.h>
#include "zfcp_ext.h"
#include "zfcp_ext.h"
-#include "zfcp_def.h"
#define ZFCP_LOG_AREA ZFCP_LOG_AREA_CONFIG
#define ZFCP_LOG_AREA ZFCP_LOG_AREA_CONFIG
@@
-67,7
+64,7
@@
static ssize_t zfcp_sysfs_loglevel_##_name##_store(struct device_driver *drv, \
static ssize_t zfcp_sysfs_loglevel_##_name##_show(struct device_driver *dev, \
char *buf) \
{ \
static ssize_t zfcp_sysfs_loglevel_##_name##_show(struct device_driver *dev, \
char *buf) \
{ \
- return sprintf(buf,"%d\n",
\
+ return sprintf(buf,"%d\n",
(unsigned int)
\
ZFCP_GET_LOG_VALUE(ZFCP_LOG_AREA_##_define)); \
} \
\
ZFCP_GET_LOG_VALUE(ZFCP_LOG_AREA_##_define)); \
} \
\
@@
-87,7
+84,7
@@
ZFCP_DEFINE_DRIVER_ATTR(fc, FC);
static ssize_t zfcp_sysfs_version_show(struct device_driver *dev,
char *buf)
{
static ssize_t zfcp_sysfs_version_show(struct device_driver *dev,
char *buf)
{
- return sprintf(buf, "%s\n",
ZFCP_VERSION
);
+ return sprintf(buf, "%s\n",
zfcp_data.driver_version
);
}
static DRIVER_ATTR(version, S_IRUGO, zfcp_sysfs_version_show, NULL);
}
static DRIVER_ATTR(version, S_IRUGO, zfcp_sysfs_version_show, NULL);