diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2009-12-17 08:15:09 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 10:20:30 -0500 |
commit | 331d9d5958277de27e6ce42247e1cbec54fd1c7e (patch) | |
tree | c8bf38b5a388a1e1ba617e034e7baff87e4f981e | |
parent | 04a1e62c2cec820501f93526ad1e46073b802dc4 (diff) |
Revert "fbdev: atafb - add palette register check"
This reverts commit 8546e3ce6e37c359979b69862442f94e0ef0e03b, as it's a
partial duplicate of commit 2f390380ca69e1617cdddb12d8da94f0a9f4319d
("fbdev: add palette register check to several drivers").
The former went in first through the m68k tree, the latter through Andrew
Morton.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/video/atafb.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c index 2051c9dc813b..b7687c55fe16 100644 --- a/drivers/video/atafb.c +++ b/drivers/video/atafb.c | |||
@@ -2245,9 +2245,6 @@ static int ext_setcolreg(unsigned int regno, unsigned int red, | |||
2245 | if (regno > 255) | 2245 | if (regno > 255) |
2246 | return 1; | 2246 | return 1; |
2247 | 2247 | ||
2248 | if (regno > 255) | ||
2249 | return 1; | ||
2250 | |||
2251 | switch (external_card_type) { | 2248 | switch (external_card_type) { |
2252 | case IS_VGA: | 2249 | case IS_VGA: |
2253 | OUTB(0x3c8, regno); | 2250 | OUTB(0x3c8, regno); |