[PATCH 4/7 fbdev: Remove remains of epson1356fb

PATCH Antonino A. Daplas 1 participant 1 message Nov 7, 2005

Subsystems (2)

MIPS Framebuffer layer

lore

Share & tools

lore

Antonino A. Daplas

author

2005-11-07 11:29 UTC #0 lore raw

From: Ralf Baechle <[email protected]>

Delete leftovers of the FB_E1356 and anything that did depend on it.

Signed-off-by Ralf Baechle <[email protected]>

Signed-off-by Antonino Daplas <[email protected]>

---
 arch/mips/au1000/common/setup.c           |   11 ----------
 arch/mips/configs/ddb5476_defconfig       |    1 
 arch/mips/configs/jmr3927_defconfig       |    1 
 arch/mips/configs/ocelot_3_defconfig      |    1 
 arch/mips/configs/pnx8550-v2pci_defconfig |    1 
 arch/mips/configs/rbhma4500_defconfig     |    1 
 drivers/video/Kconfig                     |   32 ------------------------------
 7 files changed, 48 deletions(-)

arch/mips/au1000/common/setup.c +0 ~~-11~~

index 1ef15d5..4f21f42 100644
@@ -111,17 +111,6 @@ void __init plat_setup(void)
     }
 #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
 	if ((argptr = strstr(argptr, "video=")) == NULL) {
 		argptr = prom_getcmdline();

arch/mips/configs/ddb5476_defconfig +0 -1

index b260e51..326f3aa 100644
@@ -658,7 +658,6 @@ CONFIG_FB=y
 # CONFIG_FB_SMIVGX is not set
 # CONFIG_FB_CYBLA is not set
 # CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_E1356 is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_VIRTUAL is not set

arch/mips/configs/jmr3927_defconfig +0 -1

index 9a728c2..6390a75 100644
@@ -628,7 +628,6 @@ CONFIG_FB=y
 # CONFIG_FB_SMIVGX is not set
 # CONFIG_FB_CYBLA is not set
 # CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_E1356 is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_VIRTUAL is not set

arch/mips/configs/ocelot_3_defconfig +0 -1

index ffb23fc..f18d05c 100644
@@ -758,7 +758,6 @@ CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_SMIVGX is not set
 # CONFIG_FB_CYBLA is not set
 # CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_E1356 is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_VIRTUAL is not set

arch/mips/configs/pnx8550-v2pci_defconfig +0 -1

index deb24c2..4a74f8c 100644
@@ -895,7 +895,6 @@ CONFIG_FB=y
 # CONFIG_FB_SMIVGX is not set
 # CONFIG_FB_CYBLA is not set
 # CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_E1356 is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_VIRTUAL is not set

arch/mips/configs/rbhma4500_defconfig +0 -1

index 2bc61ca..897420d 100644
@@ -876,7 +876,6 @@ CONFIG_FB_ATY_CT=y
 # CONFIG_FB_SMIVGX is not set
 # CONFIG_FB_CYBLA is not set
 # CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_E1356 is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_VIRTUAL is not set

drivers/video/Kconfig +0 ~~-32~~

index 44b6ca2..25b6ca6 100644
@@ -593,38 +593,6 @@ config FB_EPSON1355
 	  framebuffer.  Product specs at
 	  <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
 	tristate "Epson S1D13XXX framebuffer support"
 	depends on FB

-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download it for free - -and be entered to win a 42" plasma tv or your very own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php