diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
| commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
| tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /include/asm-mips/rtlx.h | |
| parent | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (diff) | |
| parent | 066b2118976e6e7cc50eed39e2747c75343a23c4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
Diffstat (limited to 'include/asm-mips/rtlx.h')
| -rw-r--r-- | include/asm-mips/rtlx.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-mips/rtlx.h b/include/asm-mips/rtlx.h index 65778c890a62..20b666022dcb 100644 --- a/include/asm-mips/rtlx.h +++ b/include/asm-mips/rtlx.h | |||
| @@ -29,13 +29,13 @@ extern unsigned int rtlx_read_poll(int index, int can_sleep); | |||
| 29 | extern unsigned int rtlx_write_poll(int index); | 29 | extern unsigned int rtlx_write_poll(int index); |
| 30 | 30 | ||
| 31 | enum rtlx_state { | 31 | enum rtlx_state { |
| 32 | RTLX_STATE_UNUSED, | 32 | RTLX_STATE_UNUSED = 0, |
| 33 | RTLX_STATE_INITIALISED, | 33 | RTLX_STATE_INITIALISED, |
| 34 | RTLX_STATE_REMOTE_READY, | 34 | RTLX_STATE_REMOTE_READY, |
| 35 | RTLX_STATE_OPENED | 35 | RTLX_STATE_OPENED |
| 36 | }; | 36 | }; |
| 37 | 37 | ||
| 38 | #define RTLX_BUFFER_SIZE 1024 | 38 | #define RTLX_BUFFER_SIZE 2048 |
| 39 | 39 | ||
| 40 | /* each channel supports read and write. | 40 | /* each channel supports read and write. |
| 41 | linux (vpe0) reads lx_buffer and writes rt_buffer | 41 | linux (vpe0) reads lx_buffer and writes rt_buffer |