diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /include/linux/cfag12864b.h | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'include/linux/cfag12864b.h')
| -rw-r--r-- | include/linux/cfag12864b.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cfag12864b.h b/include/linux/cfag12864b.h index 6f9f19d66591..b454dfce60d9 100644 --- a/include/linux/cfag12864b.h +++ b/include/linux/cfag12864b.h | |||
| @@ -44,7 +44,7 @@ extern unsigned char * cfag12864b_buffer; | |||
| 44 | /* | 44 | /* |
| 45 | * Get the refresh rate of the LCD | 45 | * Get the refresh rate of the LCD |
| 46 | * | 46 | * |
| 47 | * Returns the refresh rate (hertzs). | 47 | * Returns the refresh rate (hertz). |
| 48 | */ | 48 | */ |
| 49 | extern unsigned int cfag12864b_getrate(void); | 49 | extern unsigned int cfag12864b_getrate(void); |
| 50 | 50 | ||