diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2009-12-17 14:15:09 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 07:20:30 -0800 |
| commit | 331d9d5958277de27e6ce42247e1cbec54fd1c7e (patch) | |
| tree | c8bf38b5a388a1e1ba617e034e7baff87e4f981e /drivers | |
| parent | 04a1e62c2cec820501f93526ad1e46073b802dc4 (diff) | |
| download | linux-3.10-331d9d5958277de27e6ce42247e1cbec54fd1c7e.tar.gz linux-3.10-331d9d5958277de27e6ce42247e1cbec54fd1c7e.tar.bz2 linux-3.10-331d9d5958277de27e6ce42247e1cbec54fd1c7e.zip | |
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>
Diffstat (limited to 'drivers')
| -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 2051c9dc813..b7687c55fe1 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, if (regno > 255) return 1; - if (regno > 255) - return 1; - switch (external_card_type) { case IS_VGA: OUTB(0x3c8, regno); |