diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ata/Kconfig | 1 | ||||
-rw-r--r-- | drivers/video/console/Makefile | 2 | ||||
-rw-r--r-- | drivers/video/ffb.c | 4 | ||||
-rw-r--r-- | drivers/video/sunxvr2500.c | 17 | ||||
-rw-r--r-- | drivers/video/sunxvr500.c | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 7d893a60f994..b4a8d6030e48 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
@@ -8,7 +8,6 @@ menuconfig ATA | |||
8 | depends on BLOCK | 8 | depends on BLOCK |
9 | depends on !(M32R || M68K) || BROKEN | 9 | depends on !(M32R || M68K) || BROKEN |
10 | depends on !SUN4 || BROKEN | 10 | depends on !SUN4 || BROKEN |
11 | depends on !(SPARC64 && !PCI) | ||
12 | select SCSI | 11 | select SCSI |
13 | ---help--- | 12 | ---help--- |
14 | If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or | 13 | If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or |
diff --git a/drivers/video/console/Makefile b/drivers/video/console/Makefile index 9b26dda18a38..ac46cc3f6a2a 100644 --- a/drivers/video/console/Makefile +++ b/drivers/video/console/Makefile | |||
@@ -47,7 +47,7 @@ targets := promcon_tbl.c | |||
47 | quiet_cmd_conmakehash = CNMKHSH $@ | 47 | quiet_cmd_conmakehash = CNMKHSH $@ |
48 | cmd_conmakehash = scripts/conmakehash $< | \ | 48 | cmd_conmakehash = scripts/conmakehash $< | \ |
49 | sed -e '/\#include <[^>]*>/p' -e 's/types/init/' \ | 49 | sed -e '/\#include <[^>]*>/p' -e 's/types/init/' \ |
50 | -e 's/dfont\(_uni.*\]\)/promfont\1 __initdata/' > $@ | 50 | -e 's/dfont\(_uni.*\]\)/promfont\1 /' > $@ |
51 | 51 | ||
52 | $(obj)/promcon_tbl.c: $(src)/prom.uni | 52 | $(obj)/promcon_tbl.c: $(src)/prom.uni |
53 | $(call cmd,conmakehash) | 53 | $(call cmd,conmakehash) |
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c index 1d4e8354b561..3f6c98fad437 100644 --- a/drivers/video/ffb.c +++ b/drivers/video/ffb.c | |||
@@ -656,7 +656,7 @@ static int ffb_setcolreg(unsigned regno, | |||
656 | { | 656 | { |
657 | u32 value; | 657 | u32 value; |
658 | 658 | ||
659 | if (regno >= 256) | 659 | if (regno >= 16) |
660 | return 1; | 660 | return 1; |
661 | 661 | ||
662 | red >>= 8; | 662 | red >>= 8; |
@@ -903,7 +903,7 @@ ffb_init_fix(struct fb_info *info) | |||
903 | struct all_info { | 903 | struct all_info { |
904 | struct fb_info info; | 904 | struct fb_info info; |
905 | struct ffb_par par; | 905 | struct ffb_par par; |
906 | u32 pseudo_palette[256]; | 906 | u32 pseudo_palette[16]; |
907 | }; | 907 | }; |
908 | 908 | ||
909 | static int ffb_init_one(struct of_device *op) | 909 | static int ffb_init_one(struct of_device *op) |
diff --git a/drivers/video/sunxvr2500.c b/drivers/video/sunxvr2500.c index 4316c7fe8e21..c3869a96ab58 100644 --- a/drivers/video/sunxvr2500.c +++ b/drivers/video/sunxvr2500.c | |||
@@ -28,7 +28,7 @@ struct s3d_info { | |||
28 | unsigned int depth; | 28 | unsigned int depth; |
29 | unsigned int fb_size; | 29 | unsigned int fb_size; |
30 | 30 | ||
31 | u32 pseudo_palette[256]; | 31 | u32 pseudo_palette[16]; |
32 | }; | 32 | }; |
33 | 33 | ||
34 | static int __devinit s3d_get_props(struct s3d_info *sp) | 34 | static int __devinit s3d_get_props(struct s3d_info *sp) |
@@ -52,15 +52,14 @@ static int s3d_setcolreg(unsigned regno, | |||
52 | { | 52 | { |
53 | u32 value; | 53 | u32 value; |
54 | 54 | ||
55 | if (regno >= 256) | 55 | if (regno < 16) { |
56 | return 1; | 56 | red >>= 8; |
57 | green >>= 8; | ||
58 | blue >>= 8; | ||
57 | 59 | ||
58 | red >>= 8; | 60 | value = (blue << 24) | (green << 16) | (red << 8); |
59 | green >>= 8; | 61 | ((u32 *)info->pseudo_palette)[regno] = value; |
60 | blue >>= 8; | 62 | } |
61 | |||
62 | value = (blue << 24) | (green << 16) | (red << 8); | ||
63 | ((u32 *)info->pseudo_palette)[regno] = value; | ||
64 | 63 | ||
65 | return 0; | 64 | return 0; |
66 | } | 65 | } |
diff --git a/drivers/video/sunxvr500.c b/drivers/video/sunxvr500.c index 08880a62bfa3..71bf3f1f00bc 100644 --- a/drivers/video/sunxvr500.c +++ b/drivers/video/sunxvr500.c | |||
@@ -50,7 +50,7 @@ struct e3d_info { | |||
50 | u32 fb8_0_off; | 50 | u32 fb8_0_off; |
51 | u32 fb8_1_off; | 51 | u32 fb8_1_off; |
52 | 52 | ||
53 | u32 pseudo_palette[256]; | 53 | u32 pseudo_palette[16]; |
54 | }; | 54 | }; |
55 | 55 | ||
56 | static int __devinit e3d_get_props(struct e3d_info *ep) | 56 | static int __devinit e3d_get_props(struct e3d_info *ep) |
@@ -126,7 +126,9 @@ static int e3d_setcolreg(unsigned regno, | |||
126 | blue_8 = blue >> 8; | 126 | blue_8 = blue >> 8; |
127 | 127 | ||
128 | value = (blue_8 << 24) | (green_8 << 16) | (red_8 << 8); | 128 | value = (blue_8 << 24) | (green_8 << 16) | (red_8 << 8); |
129 | ((u32 *)info->pseudo_palette)[regno] = value; | 129 | |
130 | if (info->fix.visual == FB_VISUAL_TRUECOLOR && regno < 16) | ||
131 | ((u32 *)info->pseudo_palette)[regno] = value; | ||
130 | 132 | ||
131 | 133 | ||
132 | red_10 = red >> 6; | 134 | red_10 = red >> 6; |