diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2011-05-10 14:52:07 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2011-05-10 16:50:41 -0400 |
| commit | 020abf03cd659388f94cb328e1e1df0656e0d7ff (patch) | |
| tree | 40d05011708ad1b4a05928d167eb120420581aa6 /include/linux/cfag12864b.h | |
| parent | 0ff8fbc61727c926883eec381fbd3d32d1fab504 (diff) | |
| parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f (diff) | |
Merge tag 'v2.6.39-rc7'
in order to pull in changes in drivers/media/dvb/firewire/ and
sound/firewire/.
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 | ||