diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-03 17:33:42 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-03 17:33:42 -0400 |
| commit | 3bb5da3837cc1aa17736b05139c9a22c3794851a (patch) | |
| tree | c92d5684a866542b1cb20641607ac1643ce03a47 /include/linux/memstick.h | |
| parent | 7feb49c82a74bc7c091b8ab2a3f96baa33d08ece (diff) | |
| parent | 9597362d354f8655ece324b01d0c640a0e99c077 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux/memstick.h')
| -rw-r--r-- | include/linux/memstick.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/memstick.h b/include/linux/memstick.h index b7ee25888836..3e686ec6a967 100644 --- a/include/linux/memstick.h +++ b/include/linux/memstick.h | |||
| @@ -239,7 +239,6 @@ struct memstick_request { | |||
| 239 | unsigned char tpc; | 239 | unsigned char tpc; |
| 240 | unsigned char data_dir:1, | 240 | unsigned char data_dir:1, |
| 241 | need_card_int:1, | 241 | need_card_int:1, |
| 242 | get_int_reg:1, | ||
| 243 | long_data:1; | 242 | long_data:1; |
| 244 | unsigned char int_reg; | 243 | unsigned char int_reg; |
| 245 | int error; | 244 | int error; |