diff options
| author | Avi Kivity <avi@qumranet.com> | 2007-03-19 14:11:12 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2007-03-19 14:11:12 +0200 |
| commit | 7b99ea3b210c8433102c98eb390c7c776360fe3d (patch) | |
| tree | 343ae6ce2c51ad6f08559c45a12add04b6e66991 /drivers/video/cg14.c | |
| parent | 128e159e11e999496ec44a549fcac91de3802389 (diff) | |
| parent | 5851fadce8824d5d4b8fd02c22ae098401f6489e (diff) | |
Merge branch 'origin'kvm-17
Diffstat (limited to 'drivers/video/cg14.c')
| -rw-r--r-- | drivers/video/cg14.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c index ec6a51a5822d..b071bb632b97 100644 --- a/drivers/video/cg14.c +++ b/drivers/video/cg14.c @@ -354,7 +354,8 @@ static int cg14_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) * Initialisation */ -static void cg14_init_fix(struct fb_info *info, int linebytes, struct device_node *dp) +static void __devinit cg14_init_fix(struct fb_info *info, int linebytes, + struct device_node *dp) { const char *name = dp->name; @@ -368,7 +369,7 @@ static void cg14_init_fix(struct fb_info *info, int linebytes, struct device_nod info->fix.accel = FB_ACCEL_SUN_CG14; } -static struct sbus_mmap_map __cg14_mmap_map[CG14_MMAP_ENTRIES] __initdata = { +static struct sbus_mmap_map __cg14_mmap_map[CG14_MMAP_ENTRIES] __devinitdata = { { .voff = CG14_REGS, .poff = 0x80000000, |