diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-12 00:43:32 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-12 00:43:32 -0400 |
| commit | b6ec995a21a9428aef620b5adf46d047a18d88b8 (patch) | |
| tree | 6719121e6605cbca524b687f47336b9bbf3b8d41 /include/asm-arm/hardware/scoop.h | |
| parent | 3a5f8c5f788d68e325d9fe3c26f4df5a5aee838a (diff) | |
| parent | da64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89 (diff) | |
Merge from Linus' tree
Diffstat (limited to 'include/asm-arm/hardware/scoop.h')
| -rw-r--r-- | include/asm-arm/hardware/scoop.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/hardware/scoop.h b/include/asm-arm/hardware/scoop.h index 527404b5a8df..a8f1013930e3 100644 --- a/include/asm-arm/hardware/scoop.h +++ b/include/asm-arm/hardware/scoop.h | |||
| @@ -38,6 +38,8 @@ | |||
| 38 | struct scoop_config { | 38 | struct scoop_config { |
| 39 | unsigned short io_out; | 39 | unsigned short io_out; |
| 40 | unsigned short io_dir; | 40 | unsigned short io_dir; |
| 41 | unsigned short suspend_clr; | ||
| 42 | unsigned short suspend_set; | ||
| 41 | }; | 43 | }; |
| 42 | 44 | ||
| 43 | /* Structure for linking scoop devices to PCMCIA sockets */ | 45 | /* Structure for linking scoop devices to PCMCIA sockets */ |