diff options
| author | James Morris <jmorris@namei.org> | 2009-05-08 03:56:47 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-05-08 03:56:47 -0400 |
| commit | d254117099d711f215e62427f55dfb8ebd5ad011 (patch) | |
| tree | 0848ff8dd74314fec14a86497f8d288c86ba7c65 /include/linux/rtc-v3020.h | |
| parent | 07ff7a0b187f3951788f64ae1f30e8109bc8e9eb (diff) | |
| parent | 8c9ed899b44c19e81859fbb0e9d659fe2f8630fc (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'include/linux/rtc-v3020.h')
| -rw-r--r-- | include/linux/rtc-v3020.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/rtc-v3020.h b/include/linux/rtc-v3020.h index bf74e63c98fe..8ba646e610d9 100644 --- a/include/linux/rtc-v3020.h +++ b/include/linux/rtc-v3020.h | |||
| @@ -14,6 +14,12 @@ | |||
| 14 | * is used depends on the board. */ | 14 | * is used depends on the board. */ |
| 15 | struct v3020_platform_data { | 15 | struct v3020_platform_data { |
| 16 | int leftshift; /* (1<<(leftshift)) & readl() */ | 16 | int leftshift; /* (1<<(leftshift)) & readl() */ |
| 17 | |||
| 18 | int use_gpio:1; | ||
| 19 | unsigned int gpio_cs; | ||
| 20 | unsigned int gpio_wr; | ||
| 21 | unsigned int gpio_rd; | ||
| 22 | unsigned int gpio_io; | ||
| 17 | }; | 23 | }; |
| 18 | 24 | ||
| 19 | #define V3020_STATUS_0 0x00 | 25 | #define V3020_STATUS_0 0x00 |