diff options
| author | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
| commit | 65127d28e312bb6b38ce84a7bb71d762ef63ad4c (patch) | |
| tree | d5fdf52a2d0731f7fab0ce0ed394faac50b04fbc /include/linux/rtc-v3020.h | |
| parent | b8bb76713ec50df2f11efee386e16f93d51e1076 (diff) | |
| parent | 8fe74cf053de7ad2124a894996f84fa890a81093 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge
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 |