diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-24 17:48:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-24 17:48:35 -0400 |
| commit | b464f5794619bbe98a92e1bc4180986e39615ac4 (patch) | |
| tree | 50f6df06a582b1c6b563af7ffd736a365a7941dd /drivers/video/intelfb/intelfb.h | |
| parent | b9d8be7828e974f076717f0da608d052440fe192 (diff) | |
| parent | 0fe6e2d2928e089d16ec5ed7ba634c1d60916020 (diff) | |
Merge branch 'intelfb-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6
* 'intelfb-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6:
intelfb delousing
Diffstat (limited to 'drivers/video/intelfb/intelfb.h')
| -rw-r--r-- | drivers/video/intelfb/intelfb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h index 469b06c29180..e290d7460e1b 100644 --- a/drivers/video/intelfb/intelfb.h +++ b/drivers/video/intelfb/intelfb.h | |||
| @@ -237,7 +237,7 @@ struct intelfb_info { | |||
| 237 | u32 fb_start; | 237 | u32 fb_start; |
| 238 | 238 | ||
| 239 | /* ring buffer */ | 239 | /* ring buffer */ |
| 240 | u8 __iomem *ring_head; | 240 | u32 ring_head; |
| 241 | u32 ring_tail; | 241 | u32 ring_tail; |
| 242 | u32 ring_tail_mask; | 242 | u32 ring_tail_mask; |
| 243 | u32 ring_space; | 243 | u32 ring_space; |