diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 15:40:05 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 15:40:05 +0100 |
commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /drivers/message/i2o/i2o_proc.c | |
parent | [ARM] Move AMBA include files to include/linux/amba/ (diff) | |
parent | [PATCH] Fix posix-cpu-timers sched_time accumulation (diff) | |
download | linux-123656d4cc8c946f578ebd18c2050f5251720428.tar.xz linux-123656d4cc8c946f578ebd18c2050f5251720428.zip |
Merge with Linus' kernel.
Diffstat (limited to 'drivers/message/i2o/i2o_proc.c')
-rw-r--r-- | drivers/message/i2o/i2o_proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c index d559a1758363..2a0c42b8cda5 100644 --- 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_VERSION "1.145" +#define OSM_VERSION "1.316" #define OSM_DESCRIPTION "I2O ProcFS OSM" #define I2O_MAX_MODULES 4 |