diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-26 10:27:39 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-26 10:27:39 -0700 |
commit | f49809fe9b39e22b0f6f75c86295ce216ce3e374 (patch) | |
tree | 05f8c05ee71307c9ab02663cfaa5f08a21c6629f /drivers/s390/net/cu3088.h | |
parent | cdbbde14cb55dd10771ce79154f787322d88411b (diff) | |
parent | c1ef1f351db70ad60c793b8218dd9f6739cfd66d (diff) | |
download | kernel_samsung_smdk4412-f49809fe9b39e22b0f6f75c86295ce216ce3e374.zip kernel_samsung_smdk4412-f49809fe9b39e22b0f6f75c86295ce216ce3e374.tar.gz kernel_samsung_smdk4412-f49809fe9b39e22b0f6f75c86295ce216ce3e374.tar.bz2 |
Automatic merge of 'for-linus' branch from
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/s390/net/cu3088.h')
-rw-r--r-- | drivers/s390/net/cu3088.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/s390/net/cu3088.h b/drivers/s390/net/cu3088.h index 0ec49a8..1753661 100644 --- a/drivers/s390/net/cu3088.h +++ b/drivers/s390/net/cu3088.h @@ -23,6 +23,9 @@ enum channel_types { /* Device is a OSA2 card */ channel_type_osa2, + /* Device is a CLAW channel device */ + channel_type_claw, + /* Device is a channel, but we don't know * anything about it */ channel_type_unknown, |