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
/
zorro
/
zorro-sysfs.c
diff --git
a/drivers/zorro/zorro-sysfs.c
b/drivers/zorro/zorro-sysfs.c
index
dad03fc
..
87c29d7
100644
(file)
--- a/
drivers/zorro/zorro-sysfs.c
+++ b/
drivers/zorro/zorro-sysfs.c
@@
-14,6
+14,7
@@
#include <linux/kernel.h>
#include <linux/zorro.h>
#include <linux/stat.h>
#include <linux/kernel.h>
#include <linux/zorro.h>
#include <linux/stat.h>
+#include <linux/string.h>
#include "zorro.h"
#include "zorro.h"
@@
-21,7
+22,7
@@
/* show configuration fields */
#define zorro_config_attr(name, field, format_string) \
static ssize_t \
/* show configuration fields */
#define zorro_config_attr(name, field, format_string) \
static ssize_t \
-show_##name(struct device *dev,
char *buf)
\
+show_##name(struct device *dev,
struct device_attribute *attr, char *buf)
\
{ \
struct zorro_dev *z; \
\
{ \
struct zorro_dev *z; \
\
@@
-36,7
+37,7
@@
zorro_config_attr(serial, rom.er_SerialNumber, "0x%08x\n");
zorro_config_attr(slotaddr, slotaddr, "0x%04x\n");
zorro_config_attr(slotsize, slotsize, "0x%04x\n");
zorro_config_attr(slotaddr, slotaddr, "0x%04x\n");
zorro_config_attr(slotsize, slotsize, "0x%04x\n");
-static ssize_t zorro_show_resource(struct device *dev, char *buf)
+static ssize_t zorro_show_resource(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct zorro_dev *z = to_zorro_dev(dev);
{
struct zorro_dev *z = to_zorro_dev(dev);