diff options
Diffstat (limited to 'drivers/video/valkyriefb.c')
-rw-r--r-- | drivers/video/valkyriefb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c index 4bb9a0b18950..6b52bf65f0b5 100644 --- a/drivers/video/valkyriefb.c +++ b/drivers/video/valkyriefb.c | |||
@@ -69,7 +69,7 @@ | |||
69 | #ifdef CONFIG_MAC | 69 | #ifdef CONFIG_MAC |
70 | /* We don't yet have functions to read the PRAM... perhaps we can | 70 | /* We don't yet have functions to read the PRAM... perhaps we can |
71 | adapt them from the PPC code? */ | 71 | adapt them from the PPC code? */ |
72 | static int default_vmode = VMODE_640_480_67; | 72 | static int default_vmode = VMODE_CHOOSE; |
73 | static int default_cmode = CMODE_8; | 73 | static int default_cmode = CMODE_8; |
74 | #else | 74 | #else |
75 | static int default_vmode = VMODE_NVRAM; | 75 | static int default_vmode = VMODE_NVRAM; |
@@ -326,11 +326,11 @@ int __init valkyriefb_init(void) | |||
326 | 326 | ||
327 | #ifdef CONFIG_MAC | 327 | #ifdef CONFIG_MAC |
328 | if (!MACH_IS_MAC) | 328 | if (!MACH_IS_MAC) |
329 | return 0; | 329 | return -ENODEV; |
330 | if (!(mac_bi_data.id == MAC_MODEL_Q630 | 330 | if (!(mac_bi_data.id == MAC_MODEL_Q630 |
331 | /* I'm not sure about this one */ | 331 | /* I'm not sure about this one */ |
332 | || mac_bi_data.id == MAC_MODEL_P588)) | 332 | || mac_bi_data.id == MAC_MODEL_P588)) |
333 | return 0; | 333 | return -ENODEV; |
334 | 334 | ||
335 | /* Hardcoded addresses... welcome to 68k Macintosh country :-) */ | 335 | /* Hardcoded addresses... welcome to 68k Macintosh country :-) */ |
336 | frame_buffer_phys = 0xf9000000; | 336 | frame_buffer_phys = 0xf9000000; |