Merge branch 'master'

1 files changed, 11 insertions, 1 deletions

diff --git a/drivers/s390/net/qeth_fs.h b/drivers/s390/net/qeth_fs.h
index 5c9a51ce91b6..c0b4c8d82c45 100644
--- a/drivers/s390/net/qeth_fs.h
+++ b/drivers/s390/net/qeth_fs.h
@@ -12,7 +12,7 @@
 #ifndef __QETH_FS_H__
 #define __QETH_FS_H__
 
-#define VERSION_QETH_FS_H "$Revision: 1.9 $"
+#define VERSION_QETH_FS_H "$Revision: 1.10 $"
 
 extern const char *VERSION_QETH_PROC_C;
 extern const char *VERSION_QETH_SYS_C;
@@ -43,6 +43,12 @@ extern void
 qeth_remove_device_attributes(struct device *dev);
 
 extern int
+qeth_create_device_attributes_osn(struct device *dev);
+
+extern void
+qeth_remove_device_attributes_osn(struct device *dev);
+                    
+extern int
 qeth_create_driver_attributes(void);
 
 extern void
@@ -108,6 +114,8 @@ qeth_get_cardname(struct qeth_card *card)
                         return " OSD Express";
                 case QETH_CARD_TYPE_IQD:
                         return " HiperSockets";
+                case QETH_CARD_TYPE_OSN:
+                        return " OSN QDIO";
                 default:
                         return " unknown";
                 }
@@ -153,6 +161,8 @@ qeth_get_cardname_short(struct qeth_card *card)
                         }
                 case QETH_CARD_TYPE_IQD:
                         return "HiperSockets";
+                case QETH_CARD_TYPE_OSN:
+                        return "OSN";
                 default:
                         return "unknown";
                 }