diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-11 04:29:48 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-11 04:29:48 -0400 |
| commit | 29d8699ebb1e8948a612306c69e6d9c4ef23342f (patch) | |
| tree | f2378e8d2fbef7fc215a25acf2042b8965109e5e /include/asm-arm/hardware/scoop.h | |
| parent | e9438250b635f7832e99a8c8d2e394dd1522ce65 (diff) | |
| parent | 907a42617970a159361f17ef9a63f04d276995ab (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
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 */ |