diff options
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/backlight/locomolcd.c | 23 | ||||
-rw-r--r-- | drivers/video/cirrusfb.c | 2 | ||||
-rw-r--r-- | drivers/video/hpfb.c | 4 | ||||
-rw-r--r-- | drivers/video/pm3fb.c | 18 |
4 files changed, 23 insertions, 24 deletions
diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c index ada6e75eb048..60831bb23685 100644 --- a/drivers/video/backlight/locomolcd.c +++ b/drivers/video/backlight/locomolcd.c | |||
@@ -20,14 +20,10 @@ | |||
20 | 20 | ||
21 | #include <asm/hardware/locomo.h> | 21 | #include <asm/hardware/locomo.h> |
22 | #include <asm/irq.h> | 22 | #include <asm/irq.h> |
23 | #include <asm/mach/sharpsl_param.h> | ||
24 | #include <asm/mach-types.h> | ||
23 | 25 | ||
24 | #ifdef CONFIG_SA1100_COLLIE | 26 | #include "../../../arch/arm/mach-sa1100/generic.h" |
25 | #include <asm/arch/collie.h> | ||
26 | #else | ||
27 | #include <asm/arch/poodle.h> | ||
28 | #endif | ||
29 | |||
30 | extern void (*sa1100fb_lcd_power)(int on); | ||
31 | 27 | ||
32 | static struct locomo_dev *locomolcd_dev; | 28 | static struct locomo_dev *locomolcd_dev; |
33 | 29 | ||
@@ -82,7 +78,7 @@ static void locomolcd_off(int comadj) | |||
82 | 78 | ||
83 | void locomolcd_power(int on) | 79 | void locomolcd_power(int on) |
84 | { | 80 | { |
85 | int comadj = 118; | 81 | int comadj = sharpsl_param.comadj; |
86 | unsigned long flags; | 82 | unsigned long flags; |
87 | 83 | ||
88 | local_irq_save(flags); | 84 | local_irq_save(flags); |
@@ -93,11 +89,12 @@ void locomolcd_power(int on) | |||
93 | } | 89 | } |
94 | 90 | ||
95 | /* read comadj */ | 91 | /* read comadj */ |
96 | #ifdef CONFIG_MACH_POODLE | 92 | if (comadj == -1) { |
97 | comadj = 118; | 93 | if (machine_is_poodle()) |
98 | #else | 94 | comadj = 118; |
99 | comadj = 128; | 95 | if (machine_is_collie()) |
100 | #endif | 96 | comadj = 128; |
97 | } | ||
101 | 98 | ||
102 | if (on) | 99 | if (on) |
103 | locomolcd_on(comadj); | 100 | locomolcd_on(comadj); |
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c index e0dbdfc0c8b4..66d6f2f0a219 100644 --- a/drivers/video/cirrusfb.c +++ b/drivers/video/cirrusfb.c | |||
@@ -2622,7 +2622,7 @@ static int __init cirrusfb_init(void) | |||
2622 | #endif | 2622 | #endif |
2623 | 2623 | ||
2624 | #ifdef CONFIG_ZORRO | 2624 | #ifdef CONFIG_ZORRO |
2625 | error |= zorro_module_init(&cirrusfb_zorro_driver); | 2625 | error |= zorro_register_driver(&cirrusfb_zorro_driver); |
2626 | #endif | 2626 | #endif |
2627 | #ifdef CONFIG_PCI | 2627 | #ifdef CONFIG_PCI |
2628 | error |= pci_register_driver(&cirrusfb_pci_driver); | 2628 | error |= pci_register_driver(&cirrusfb_pci_driver); |
diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c index bebdac59d231..abd920a663a0 100644 --- a/drivers/video/hpfb.c +++ b/drivers/video/hpfb.c | |||
@@ -386,7 +386,9 @@ int __init hpfb_init(void) | |||
386 | if (fb_get_options("hpfb", NULL)) | 386 | if (fb_get_options("hpfb", NULL)) |
387 | return -ENODEV; | 387 | return -ENODEV; |
388 | 388 | ||
389 | dio_module_init(&hpfb_driver); | 389 | err = dio_register_driver(&hpfb_driver); |
390 | if (err) | ||
391 | return err; | ||
390 | 392 | ||
391 | fs = get_fs(); | 393 | fs = get_fs(); |
392 | set_fs(KERNEL_DS); | 394 | set_fs(KERNEL_DS); |
diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c index 0e78ddc81583..52c18a35fb41 100644 --- a/drivers/video/pm3fb.c +++ b/drivers/video/pm3fb.c | |||
@@ -3532,26 +3532,26 @@ int __init pm3fb_init(void) | |||
3532 | MODULE_AUTHOR("Romain Dolbeau"); | 3532 | MODULE_AUTHOR("Romain Dolbeau"); |
3533 | MODULE_DESCRIPTION("Permedia3 framebuffer device driver"); | 3533 | MODULE_DESCRIPTION("Permedia3 framebuffer device driver"); |
3534 | static char *mode[PM3_MAX_BOARD]; | 3534 | static char *mode[PM3_MAX_BOARD]; |
3535 | MODULE_PARM(mode,PM3_MAX_BOARD_MODULE_ARRAY_STRING); | 3535 | module_param_array(mode, charp, NULL, 0); |
3536 | MODULE_PARM_DESC(mode,"video mode"); | 3536 | MODULE_PARM_DESC(mode,"video mode"); |
3537 | MODULE_PARM(disable,PM3_MAX_BOARD_MODULE_ARRAY_SHORT); | 3537 | module_param_array(disable, short, NULL, 0); |
3538 | MODULE_PARM_DESC(disable,"disable board"); | 3538 | MODULE_PARM_DESC(disable,"disable board"); |
3539 | static short off[PM3_MAX_BOARD]; | 3539 | static short off[PM3_MAX_BOARD]; |
3540 | MODULE_PARM(off,PM3_MAX_BOARD_MODULE_ARRAY_SHORT); | 3540 | module_param_array(off, short, NULL, 0); |
3541 | MODULE_PARM_DESC(off,"disable board"); | 3541 | MODULE_PARM_DESC(off,"disable board"); |
3542 | static char *pciid[PM3_MAX_BOARD]; | 3542 | static char *pciid[PM3_MAX_BOARD]; |
3543 | MODULE_PARM(pciid,PM3_MAX_BOARD_MODULE_ARRAY_STRING); | 3543 | module_param_array(pciid, charp, NULL, 0); |
3544 | MODULE_PARM_DESC(pciid,"board PCI Id"); | 3544 | MODULE_PARM_DESC(pciid,"board PCI Id"); |
3545 | MODULE_PARM(noaccel,PM3_MAX_BOARD_MODULE_ARRAY_SHORT); | 3545 | module_param_array(noaccel, short, NULL, 0); |
3546 | MODULE_PARM_DESC(noaccel,"disable accel"); | 3546 | MODULE_PARM_DESC(noaccel,"disable accel"); |
3547 | static char *font[PM3_MAX_BOARD]; | 3547 | static char *font[PM3_MAX_BOARD]; |
3548 | MODULE_PARM(font,PM3_MAX_BOARD_MODULE_ARRAY_STRING); | 3548 | module_param_array(font, charp, NULL, 0); |
3549 | MODULE_PARM_DESC(font,"choose font"); | 3549 | MODULE_PARM_DESC(font,"choose font"); |
3550 | MODULE_PARM(depth,PM3_MAX_BOARD_MODULE_ARRAY_SHORT); | 3550 | module_param(depth, short, NULL, 0); |
3551 | MODULE_PARM_DESC(depth,"boot-time depth"); | 3551 | MODULE_PARM_DESC(depth,"boot-time depth"); |
3552 | MODULE_PARM(printtimings, "h"); | 3552 | module_param(printtimings, short, NULL, 0); |
3553 | MODULE_PARM_DESC(printtimings, "print the memory timings of the card(s)"); | 3553 | MODULE_PARM_DESC(printtimings, "print the memory timings of the card(s)"); |
3554 | MODULE_PARM(forcesize, PM3_MAX_BOARD_MODULE_ARRAY_SHORT); | 3554 | module_param(forcesize, short, NULL, 0); |
3555 | MODULE_PARM_DESC(forcesize, "force specified memory size"); | 3555 | MODULE_PARM_DESC(forcesize, "force specified memory size"); |
3556 | /* | 3556 | /* |
3557 | MODULE_SUPPORTED_DEVICE("Permedia3 PCI boards") | 3557 | MODULE_SUPPORTED_DEVICE("Permedia3 PCI boards") |