diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-06-05 14:42:27 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-06-05 14:42:27 -0400 |
| commit | dea58b80f2625d3712645fb6ff0af45866cedaae (patch) | |
| tree | b9c0d4f7d4fcd90e438b5cc5d05471e52615a62d /drivers/s390/net/qeth_fs.h | |
| parent | b1141f6d5dead296adcabd4a1e8ea2b994e287cb (diff) | |
| parent | 672c6108a51bf559d19595d9f8193dfd81f0f752 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'drivers/s390/net/qeth_fs.h')
| -rw-r--r-- | drivers/s390/net/qeth_fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/net/qeth_fs.h b/drivers/s390/net/qeth_fs.h index e422b41c656e..61faf05517d6 100644 --- a/drivers/s390/net/qeth_fs.h +++ b/drivers/s390/net/qeth_fs.h | |||
| @@ -42,7 +42,7 @@ qeth_create_device_attributes_osn(struct device *dev); | |||
| 42 | 42 | ||
| 43 | extern void | 43 | extern void |
| 44 | qeth_remove_device_attributes_osn(struct device *dev); | 44 | qeth_remove_device_attributes_osn(struct device *dev); |
| 45 | 45 | ||
| 46 | extern int | 46 | extern int |
| 47 | qeth_create_driver_attributes(void); | 47 | qeth_create_driver_attributes(void); |
| 48 | 48 | ||