diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
| commit | f0eef25339f92f7cd4aeea23d9ae97987a5a1e82 (patch) | |
| tree | 2472e94d39f43a9580a6d2d5d92de0b749023263 /drivers/char/sx.h | |
| parent | 0cfea5dd98205f2fa318836da664a7d7df1afbc1 (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Diffstat (limited to 'drivers/char/sx.h')
| -rw-r--r-- | drivers/char/sx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/sx.h b/drivers/char/sx.h index e01f83cbe299..432aad0a2ddd 100644 --- a/drivers/char/sx.h +++ b/drivers/char/sx.h | |||
| @@ -35,6 +35,7 @@ struct sx_board { | |||
| 35 | void __iomem *base; | 35 | void __iomem *base; |
| 36 | void __iomem *base2; | 36 | void __iomem *base2; |
| 37 | unsigned long hw_base; | 37 | unsigned long hw_base; |
| 38 | resource_size_t hw_len; | ||
| 38 | int eisa_base; | 39 | int eisa_base; |
| 39 | int port_base; /* Number of the first port */ | 40 | int port_base; /* Number of the first port */ |
| 40 | struct sx_port *ports; | 41 | struct sx_port *ports; |