summaryrefslogtreecommitdiffstats
path: root/drivers/video/intelfb/intelfb.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-24 14:48:35 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-24 14:48:35 -0700
commitb464f5794619bbe98a92e1bc4180986e39615ac4 (patch)
tree50f6df06a582b1c6b563af7ffd736a365a7941dd /drivers/video/intelfb/intelfb.h
parentb9d8be7828e974f076717f0da608d052440fe192 (diff)
parent0fe6e2d2928e089d16ec5ed7ba634c1d60916020 (diff)
downloadop-kernel-dev-b464f5794619bbe98a92e1bc4180986e39615ac4.zip
op-kernel-dev-b464f5794619bbe98a92e1bc4180986e39615ac4.tar.gz
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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h
index 469b06c..e290d74 100644
--- a/drivers/video/intelfb/intelfb.h
+++ b/drivers/video/intelfb/intelfb.h
@@ -237,7 +237,7 @@ struct intelfb_info {
u32 fb_start;
/* ring buffer */
- u8 __iomem *ring_head;
+ u32 ring_head;
u32 ring_tail;
u32 ring_tail_mask;
u32 ring_space;
OpenPOWER on IntegriCloud