diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
| commit | b74b953b998bcc2db91b694446f3a2619ec32de6 (patch) | |
| tree | 6ce24caabd730f6ae9287ed0676ec32e6ff31e9d /include/linux/rtc-v3020.h | |
| parent | abb438526201c6a79949ad45375c051b6681c253 (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).
Diffstat (limited to 'include/linux/rtc-v3020.h')
| -rw-r--r-- | include/linux/rtc-v3020.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/rtc-v3020.h b/include/linux/rtc-v3020.h index 8ba646e610d9..e55d82cebf80 100644 --- a/include/linux/rtc-v3020.h +++ b/include/linux/rtc-v3020.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | struct v3020_platform_data { | 15 | struct v3020_platform_data { |
| 16 | int leftshift; /* (1<<(leftshift)) & readl() */ | 16 | int leftshift; /* (1<<(leftshift)) & readl() */ |
| 17 | 17 | ||
| 18 | int use_gpio:1; | 18 | unsigned int use_gpio:1; |
| 19 | unsigned int gpio_cs; | 19 | unsigned int gpio_cs; |
| 20 | unsigned int gpio_wr; | 20 | unsigned int gpio_wr; |
| 21 | unsigned int gpio_rd; | 21 | unsigned int gpio_rd; |