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
/
message
/
i2o
/
i2o_proc.c
diff --git
a/drivers/message/i2o/i2o_proc.c
b/drivers/message/i2o/i2o_proc.c
index
b176d0e
..
3d2e76e
100644
(file)
--- a/
drivers/message/i2o/i2o_proc.c
+++ b/
drivers/message/i2o/i2o_proc.c
@@
-28,7
+28,7
@@
*/
#define OSM_NAME "proc-osm"
*/
#define OSM_NAME "proc-osm"
-#define OSM_VERSION "
$Rev$
"
+#define OSM_VERSION "
1.316
"
#define OSM_DESCRIPTION "I2O ProcFS OSM"
#define I2O_MAX_MODULES 4
#define OSM_DESCRIPTION "I2O ProcFS OSM"
#define I2O_MAX_MODULES 4
@@
-56,7
+56,7
@@
typedef struct _i2o_proc_entry_t {
char *name; /* entry name */
mode_t mode; /* mode */
typedef struct _i2o_proc_entry_t {
char *name; /* entry name */
mode_t mode; /* mode */
-
struct file_operations *fops;
/* open function */
+
const struct file_operations *fops;
/* open function */
} i2o_proc_entry;
/* global I2O /proc/i2o entry */
} i2o_proc_entry;
/* global I2O /proc/i2o entry */
@@
-228,7
+228,7
@@
static const char *i2o_get_class_name(int class)
case I2O_CLASS_FLOPPY_DEVICE:
idx = 12;
break;
case I2O_CLASS_FLOPPY_DEVICE:
idx = 12;
break;
- case I2O_CLASS_BUS_ADAPTER
_PORT
:
+ case I2O_CLASS_BUS_ADAPTER:
idx = 13;
break;
case I2O_CLASS_PEER_TRANSPORT_AGENT:
idx = 13;
break;
case I2O_CLASS_PEER_TRANSPORT_AGENT:
@@
-490,7
+490,7
@@
static int i2o_seq_show_lct(struct seq_file *seq, void *v)
seq_printf(seq, ", Unknown Device Type");
break;
seq_printf(seq, ", Unknown Device Type");
break;
- case I2O_CLASS_BUS_ADAPTER
_PORT
:
+ case I2O_CLASS_BUS_ADAPTER:
if (lct->lct_entry[i].sub_class < BUS_TABLE_SIZE)
seq_printf(seq, ", %s",
bus_ports[lct->lct_entry[i].
if (lct->lct_entry[i].sub_class < BUS_TABLE_SIZE)
seq_printf(seq, ", %s",
bus_ports[lct->lct_entry[i].