[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>

diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c
index 1ef15d5ef943937c47f61903872e29ebd02a2b6a..4f21f42d096bad6737343318c64d45a802cffa77 100644 (file)
--- a/arch/mips/au1000/common/setup.c
+++ b/arch/mips/au1000/common/setup.c
@@ -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();

diff --git a/arch/mips/configs/ddb5476_defconfig b/arch/mips/configs/ddb5476_defconfig
index b260e51eb51730bfc3e0c12dc06ee527831cc25a..326f3aa637419a4583edb299e3a715f60b9571fe 100644 (file)
--- a/arch/mips/configs/ddb5476_defconfig
+++ b/arch/mips/configs/ddb5476_defconfig
@@ -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
 

diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig
index 9a728c2d8fd570d02c1b71db15b629ae9a220188..6390a753e80bc49edc3f07c2f4f36ee0127947d7 100644 (file)
--- a/arch/mips/configs/jmr3927_defconfig
+++ b/arch/mips/configs/jmr3927_defconfig
@@ -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
 

diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/ocelot_3_defconfig
index ffb23fcab862138ec53a87ffa6abc1d3711b505c..f18d05c2ca775abc6ccedc22ec7845e355e52512 100644 (file)
--- a/arch/mips/configs/ocelot_3_defconfig
+++ b/arch/mips/configs/ocelot_3_defconfig
@@ -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
 

diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig
index 05e65206a7b459625f0fc2f73e8ee55f0af621e7..37bd8d5c865d7e88aeecc9f33a7100ab54dc8acb 100644 (file)
--- a/arch/mips/configs/pnx8550-v2pci_defconfig
+++ b/arch/mips/configs/pnx8550-v2pci_defconfig
@@ -897,7 +897,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
 

diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig
index 2bc61ca4ba0809da5ad99c7243115d7411e93f44..897420d39053fc9899a1a49e3488744164a707de 100644 (file)
--- a/arch/mips/configs/rbhma4500_defconfig
+++ b/arch/mips/configs/rbhma4500_defconfig
@@ -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
 

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 44b6ca290ce36bdcde56a22a8ec13b02e5fa8fd8..25b6ca6ad081a17d4c69ffe11cd388595a530291 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -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