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
/
mca
/
mca-bus.c
diff --git
a/drivers/mca/mca-bus.c
b/drivers/mca/mca-bus.c
index
ff9be67
..
09baa43
100644
(file)
--- a/
drivers/mca/mca-bus.c
+++ b/
drivers/mca/mca-bus.c
@@
-69,7
+69,7
@@
struct bus_type mca_bus_type = {
};
EXPORT_SYMBOL (mca_bus_type);
};
EXPORT_SYMBOL (mca_bus_type);
-static ssize_t mca_show_pos_id(struct device *dev, char *buf)
+static ssize_t mca_show_pos_id(struct device *dev,
struct device_attribute *attr,
char *buf)
{
/* four digits, \n and trailing \0 */
struct mca_device *mca_dev = to_mca_device(dev);
{
/* four digits, \n and trailing \0 */
struct mca_device *mca_dev = to_mca_device(dev);
@@
-81,7
+81,7
@@
static ssize_t mca_show_pos_id(struct device *dev, char *buf)
len = sprintf(buf, "none\n");
return len;
}
len = sprintf(buf, "none\n");
return len;
}
-static ssize_t mca_show_pos(struct device *dev, char *buf)
+static ssize_t mca_show_pos(struct device *dev,
struct device_attribute *attr,
char *buf)
{
/* enough for 8 two byte hex chars plus space and new line */
int j, len=0;
{
/* enough for 8 two byte hex chars plus space and new line */
int j, len=0;