diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-07 06:38:41 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-07 06:38:41 -0400 |
| commit | 242898be7a1921f646ca529ddc26d7337c69922f (patch) | |
| tree | 674adf64ca6254318dab5bcd428ebe8ac73957ff /drivers/isdn | |
| parent | 6bbad18a8b18228fa65d73547dfd5efad1515ef8 (diff) | |
| parent | 9f737633e6ee54fc174282d49b2559bd2208391d (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/hardware/eicon/divasync.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/isdn/hardware/eicon/divasync.h b/drivers/isdn/hardware/eicon/divasync.h index 0a5be7f969f2..af3eb9e795b5 100644 --- a/drivers/isdn/hardware/eicon/divasync.h +++ b/drivers/isdn/hardware/eicon/divasync.h | |||
| @@ -256,7 +256,6 @@ typedef struct | |||
| 256 | #define NO_ORDER_CHECK_MASK 0x00000010 | 256 | #define NO_ORDER_CHECK_MASK 0x00000010 |
| 257 | #define LOW_CHANNEL_MASK 0x00000020 | 257 | #define LOW_CHANNEL_MASK 0x00000020 |
| 258 | #define NO_HSCX30_MASK 0x00000040 | 258 | #define NO_HSCX30_MASK 0x00000040 |
| 259 | #define MODE_MASK 0x00000080 | ||
| 260 | #define SET_BOARD 0x00001000 | 259 | #define SET_BOARD 0x00001000 |
| 261 | #define SET_CRC4 0x00030000 | 260 | #define SET_CRC4 0x00030000 |
| 262 | #define SET_L1_TRISTATE 0x00040000 | 261 | #define SET_L1_TRISTATE 0x00040000 |