diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /drivers/isdn/gigaset/gigaset.h | |
| parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
| parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) | |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'drivers/isdn/gigaset/gigaset.h')
| -rw-r--r-- | drivers/isdn/gigaset/gigaset.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h index 884bd72c1bf4..06298cc52bf5 100644 --- a/drivers/isdn/gigaset/gigaset.h +++ b/drivers/isdn/gigaset/gigaset.h | |||
| @@ -444,7 +444,7 @@ struct cardstate { | |||
| 444 | struct gigaset_driver *driver; | 444 | struct gigaset_driver *driver; |
| 445 | unsigned minor_index; | 445 | unsigned minor_index; |
| 446 | struct device *dev; | 446 | struct device *dev; |
| 447 | struct class_device *class; | 447 | struct device *tty_dev; |
| 448 | 448 | ||
| 449 | const struct gigaset_ops *ops; | 449 | const struct gigaset_ops *ops; |
| 450 | 450 | ||