Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[~andy/linux] / drivers / message / i2o / config-osm.c

diff --git a/drivers/message/i2o/config-osm.c b/drivers/message/i2o/config-osm.c
index b613890026bed26994c11e8c344b2cf59919eada..3bba7aa82e58bd5d5a1f0c30c30cd62a32de5d0b 100644 (file)
--- a/drivers/message/i2o/config-osm.c
+++ b/drivers/message/i2o/config-osm.c
@@ -22,7 +22,7 @@
 #include <asm/uaccess.h>
 
 #define OSM_NAME       "config-osm"
-#define OSM_VERSION    "1.317"
+#define OSM_VERSION    "1.323"
 #define OSM_DESCRIPTION        "I2O Configuration OSM"
 
 /* access mode user rw */