[PATCH] fbdev: Remove remains of epson1356fb
Delete leftovers of the FB_E1356 and anything that did depend on it. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
81d3e147ec
commit
01a16fae8e
@@ -111,17 +111,6 @@ void __init plat_setup(void)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_FB_E1356
|
|
||||||
if ((argptr = strstr(argptr, "video=")) == NULL) {
|
|
||||||
argptr = prom_getcmdline();
|
|
||||||
#ifdef CONFIG_MIPS_PB1000
|
|
||||||
strcat(argptr, " video=e1356fb:system:pb1000,mmunalign:1");
|
|
||||||
#else
|
|
||||||
strcat(argptr, " video=e1356fb:system:pb1500");
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_FB_XPERT98
|
#ifdef CONFIG_FB_XPERT98
|
||||||
if ((argptr = strstr(argptr, "video=")) == NULL) {
|
if ((argptr = strstr(argptr, "video=")) == NULL) {
|
||||||
argptr = prom_getcmdline();
|
argptr = prom_getcmdline();
|
||||||
|
@@ -658,7 +658,6 @@ CONFIG_FB=y
|
|||||||
# CONFIG_FB_SMIVGX is not set
|
# CONFIG_FB_SMIVGX is not set
|
||||||
# CONFIG_FB_CYBLA is not set
|
# CONFIG_FB_CYBLA is not set
|
||||||
# CONFIG_FB_TRIDENT is not set
|
# CONFIG_FB_TRIDENT is not set
|
||||||
# CONFIG_FB_E1356 is not set
|
|
||||||
# CONFIG_FB_S1D13XXX is not set
|
# CONFIG_FB_S1D13XXX is not set
|
||||||
# CONFIG_FB_VIRTUAL is not set
|
# CONFIG_FB_VIRTUAL is not set
|
||||||
|
|
||||||
|
@@ -628,7 +628,6 @@ CONFIG_FB=y
|
|||||||
# CONFIG_FB_SMIVGX is not set
|
# CONFIG_FB_SMIVGX is not set
|
||||||
# CONFIG_FB_CYBLA is not set
|
# CONFIG_FB_CYBLA is not set
|
||||||
# CONFIG_FB_TRIDENT is not set
|
# CONFIG_FB_TRIDENT is not set
|
||||||
# CONFIG_FB_E1356 is not set
|
|
||||||
# CONFIG_FB_S1D13XXX is not set
|
# CONFIG_FB_S1D13XXX is not set
|
||||||
# CONFIG_FB_VIRTUAL is not set
|
# CONFIG_FB_VIRTUAL is not set
|
||||||
|
|
||||||
|
@@ -758,7 +758,6 @@ CONFIG_FB_MODE_HELPERS=y
|
|||||||
# CONFIG_FB_SMIVGX is not set
|
# CONFIG_FB_SMIVGX is not set
|
||||||
# CONFIG_FB_CYBLA is not set
|
# CONFIG_FB_CYBLA is not set
|
||||||
# CONFIG_FB_TRIDENT is not set
|
# CONFIG_FB_TRIDENT is not set
|
||||||
# CONFIG_FB_E1356 is not set
|
|
||||||
# CONFIG_FB_S1D13XXX is not set
|
# CONFIG_FB_S1D13XXX is not set
|
||||||
# CONFIG_FB_VIRTUAL is not set
|
# CONFIG_FB_VIRTUAL is not set
|
||||||
|
|
||||||
|
@@ -897,7 +897,6 @@ CONFIG_FB=y
|
|||||||
# CONFIG_FB_SMIVGX is not set
|
# CONFIG_FB_SMIVGX is not set
|
||||||
# CONFIG_FB_CYBLA is not set
|
# CONFIG_FB_CYBLA is not set
|
||||||
# CONFIG_FB_TRIDENT is not set
|
# CONFIG_FB_TRIDENT is not set
|
||||||
# CONFIG_FB_E1356 is not set
|
|
||||||
# CONFIG_FB_S1D13XXX is not set
|
# CONFIG_FB_S1D13XXX is not set
|
||||||
# CONFIG_FB_VIRTUAL is not set
|
# CONFIG_FB_VIRTUAL is not set
|
||||||
|
|
||||||
|
@@ -876,7 +876,6 @@ CONFIG_FB_ATY_CT=y
|
|||||||
# CONFIG_FB_SMIVGX is not set
|
# CONFIG_FB_SMIVGX is not set
|
||||||
# CONFIG_FB_CYBLA is not set
|
# CONFIG_FB_CYBLA is not set
|
||||||
# CONFIG_FB_TRIDENT is not set
|
# CONFIG_FB_TRIDENT is not set
|
||||||
# CONFIG_FB_E1356 is not set
|
|
||||||
# CONFIG_FB_S1D13XXX is not set
|
# CONFIG_FB_S1D13XXX is not set
|
||||||
# CONFIG_FB_VIRTUAL is not set
|
# CONFIG_FB_VIRTUAL is not set
|
||||||
|
|
||||||
|
@@ -593,38 +593,6 @@ config FB_EPSON1355
|
|||||||
framebuffer. Product specs at
|
framebuffer. Product specs at
|
||||||
<http://www.erd.epson.com/vdc/html/products.htm>.
|
<http://www.erd.epson.com/vdc/html/products.htm>.
|
||||||
|
|
||||||
config FB_E1356
|
|
||||||
tristate "Epson SED1356 framebuffer support"
|
|
||||||
depends on FB && EXPERIMENTAL && PCI && MIPS
|
|
||||||
|
|
||||||
config PB1000_CRT
|
|
||||||
bool "Use CRT on Pb1000 (J65)"
|
|
||||||
depends on MIPS_PB1000=y && FB_E1356
|
|
||||||
|
|
||||||
config PB1000_NTSC
|
|
||||||
bool "Use Compsite NTSC on Pb1000 (J63)"
|
|
||||||
depends on MIPS_PB1000=y && FB_E1356
|
|
||||||
|
|
||||||
config PB1000_TFT
|
|
||||||
bool "Use TFT Panel on Pb1000 (J64)"
|
|
||||||
depends on MIPS_PB1000=y && FB_E1356
|
|
||||||
|
|
||||||
config PB1500_CRT
|
|
||||||
bool "Use CRT on Pb1500 " if MIPS_PB1500=y
|
|
||||||
depends on FB_E1356
|
|
||||||
|
|
||||||
config PB1500_CRT
|
|
||||||
prompt "Use CRT on Pb1100 "
|
|
||||||
depends on FB_E1356 && MIPS_PB1100=y
|
|
||||||
|
|
||||||
config PB1500_TFT
|
|
||||||
bool "Use TFT Panel on Pb1500 " if MIPS_PB1500=y
|
|
||||||
depends on FB_E1356
|
|
||||||
|
|
||||||
config PB1500_TFT
|
|
||||||
prompt "Use TFT Panel on Pb1100 "
|
|
||||||
depends on FB_E1356 && MIPS_PB1100=y
|
|
||||||
|
|
||||||
config FB_S1D13XXX
|
config FB_S1D13XXX
|
||||||
tristate "Epson S1D13XXX framebuffer support"
|
tristate "Epson S1D13XXX framebuffer support"
|
||||||
depends on FB
|
depends on FB
|
||||||
|
Reference in New Issue
Block a user