diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 01:44:51 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 01:44:51 -0400 |
| commit | 43d2548bb2ef7e6d753f91468a746784041e522d (patch) | |
| tree | 77d13fcd48fd998393abb825ec36e2b732684a73 /drivers/s390/net/cu3088.h | |
| parent | 585583d95c5660973bc0cf64add517b040acd8a4 (diff) | |
| parent | 85082fd7cbe3173198aac0eb5e85ab1edcc6352c (diff) | |
Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build
Manual fixup of:
arch/powerpc/Kconfig
Diffstat (limited to 'drivers/s390/net/cu3088.h')
| -rw-r--r-- | drivers/s390/net/cu3088.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/s390/net/cu3088.h b/drivers/s390/net/cu3088.h index 1753661f702a..d8558a7105a5 100644 --- a/drivers/s390/net/cu3088.h +++ b/drivers/s390/net/cu3088.h | |||
| @@ -17,9 +17,6 @@ enum channel_types { | |||
| 17 | /* Device is a FICON channel */ | 17 | /* Device is a FICON channel */ |
| 18 | channel_type_ficon, | 18 | channel_type_ficon, |
| 19 | 19 | ||
| 20 | /* Device is a P390 LCS card */ | ||
| 21 | channel_type_p390, | ||
| 22 | |||
| 23 | /* Device is a OSA2 card */ | 20 | /* Device is a OSA2 card */ |
| 24 | channel_type_osa2, | 21 | channel_type_osa2, |
| 25 | 22 | ||