aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/via_ds.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-07-28 09:30:20 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-07-28 09:30:20 +0100
commit661299d9d0437a0ff72240f3d60016ac3a361a6e (patch)
tree765512576314fc3612b503f182b9ae4e60fcf849 /drivers/char/drm/via_ds.h
parent05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff)
parent41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff)
downloadkernel_goldelico_gta04-661299d9d0437a0ff72240f3d60016ac3a361a6e.zip
kernel_goldelico_gta04-661299d9d0437a0ff72240f3d60016ac3a361a6e.tar.gz
kernel_goldelico_gta04-661299d9d0437a0ff72240f3d60016ac3a361a6e.tar.bz2
Merge with Linus' 2.6 tree
Diffstat (limited to 'drivers/char/drm/via_ds.h')
-rw-r--r--drivers/char/drm/via_ds.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/drm/via_ds.h b/drivers/char/drm/via_ds.h
index be9c7f9..d2bb9f3 100644
--- a/drivers/char/drm/via_ds.h
+++ b/drivers/char/drm/via_ds.h
@@ -61,8 +61,8 @@ struct mem_block_t {
struct mem_block_t *heap;
int ofs, size;
int align;
- int free:1;
- int reserved:1;
+ unsigned int free:1;
+ unsigned int reserved:1;
};
typedef struct mem_block_t TMemBlock;
typedef struct mem_block_t *PMemBlock;