diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2005-11-09 00:39:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:36 -0500 |
commit | 01a16fae8e0e99a5abdd1c6c9a2b67e7e6167c18 (patch) | |
tree | c6dd8df18a3116f6ae9b1e14f13edc2a7bf1fd4b /arch | |
parent | 81d3e147ec9ffc6ef04b5f05afa4bef22487b32b (diff) |
[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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/au1000/common/setup.c | 11 | ||||
-rw-r--r-- | arch/mips/configs/ddb5476_defconfig | 1 | ||||
-rw-r--r-- | arch/mips/configs/jmr3927_defconfig | 1 | ||||
-rw-r--r-- | arch/mips/configs/ocelot_3_defconfig | 1 | ||||
-rw-r--r-- | arch/mips/configs/pnx8550-v2pci_defconfig | 1 | ||||
-rw-r--r-- | arch/mips/configs/rbhma4500_defconfig | 1 |
6 files changed, 0 insertions, 16 deletions
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c index 1ef15d5ef943..4f21f42d096b 100644 --- a/arch/mips/au1000/common/setup.c +++ b/arch/mips/au1000/common/setup.c | |||
@@ -111,17 +111,6 @@ void __init plat_setup(void) | |||
111 | } | 111 | } |
112 | #endif | 112 | #endif |
113 | 113 | ||
114 | #ifdef CONFIG_FB_E1356 | ||
115 | if ((argptr = strstr(argptr, "video=")) == NULL) { | ||
116 | argptr = prom_getcmdline(); | ||
117 | #ifdef CONFIG_MIPS_PB1000 | ||
118 | strcat(argptr, " video=e1356fb:system:pb1000,mmunalign:1"); | ||
119 | #else | ||
120 | strcat(argptr, " video=e1356fb:system:pb1500"); | ||
121 | #endif | ||
122 | } | ||
123 | #endif | ||
124 | |||
125 | #ifdef CONFIG_FB_XPERT98 | 114 | #ifdef CONFIG_FB_XPERT98 |
126 | if ((argptr = strstr(argptr, "video=")) == NULL) { | 115 | if ((argptr = strstr(argptr, "video=")) == NULL) { |
127 | argptr = prom_getcmdline(); | 116 | argptr = prom_getcmdline(); |
diff --git a/arch/mips/configs/ddb5476_defconfig b/arch/mips/configs/ddb5476_defconfig index b260e51eb517..326f3aa63741 100644 --- a/arch/mips/configs/ddb5476_defconfig +++ b/arch/mips/configs/ddb5476_defconfig | |||
@@ -658,7 +658,6 @@ CONFIG_FB=y | |||
658 | # CONFIG_FB_SMIVGX is not set | 658 | # CONFIG_FB_SMIVGX is not set |
659 | # CONFIG_FB_CYBLA is not set | 659 | # CONFIG_FB_CYBLA is not set |
660 | # CONFIG_FB_TRIDENT is not set | 660 | # CONFIG_FB_TRIDENT is not set |
661 | # CONFIG_FB_E1356 is not set | ||
662 | # CONFIG_FB_S1D13XXX is not set | 661 | # CONFIG_FB_S1D13XXX is not set |
663 | # CONFIG_FB_VIRTUAL is not set | 662 | # CONFIG_FB_VIRTUAL is not set |
664 | 663 | ||
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig index 9a728c2d8fd5..6390a753e80b 100644 --- a/arch/mips/configs/jmr3927_defconfig +++ b/arch/mips/configs/jmr3927_defconfig | |||
@@ -628,7 +628,6 @@ CONFIG_FB=y | |||
628 | # CONFIG_FB_SMIVGX is not set | 628 | # CONFIG_FB_SMIVGX is not set |
629 | # CONFIG_FB_CYBLA is not set | 629 | # CONFIG_FB_CYBLA is not set |
630 | # CONFIG_FB_TRIDENT is not set | 630 | # CONFIG_FB_TRIDENT is not set |
631 | # CONFIG_FB_E1356 is not set | ||
632 | # CONFIG_FB_S1D13XXX is not set | 631 | # CONFIG_FB_S1D13XXX is not set |
633 | # CONFIG_FB_VIRTUAL is not set | 632 | # CONFIG_FB_VIRTUAL is not set |
634 | 633 | ||
diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/ocelot_3_defconfig index ffb23fcab862..f18d05c2ca77 100644 --- a/arch/mips/configs/ocelot_3_defconfig +++ b/arch/mips/configs/ocelot_3_defconfig | |||
@@ -758,7 +758,6 @@ CONFIG_FB_MODE_HELPERS=y | |||
758 | # CONFIG_FB_SMIVGX is not set | 758 | # CONFIG_FB_SMIVGX is not set |
759 | # CONFIG_FB_CYBLA is not set | 759 | # CONFIG_FB_CYBLA is not set |
760 | # CONFIG_FB_TRIDENT is not set | 760 | # CONFIG_FB_TRIDENT is not set |
761 | # CONFIG_FB_E1356 is not set | ||
762 | # CONFIG_FB_S1D13XXX is not set | 761 | # CONFIG_FB_S1D13XXX is not set |
763 | # CONFIG_FB_VIRTUAL is not set | 762 | # CONFIG_FB_VIRTUAL is not set |
764 | 763 | ||
diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig index 05e65206a7b4..37bd8d5c865d 100644 --- a/arch/mips/configs/pnx8550-v2pci_defconfig +++ b/arch/mips/configs/pnx8550-v2pci_defconfig | |||
@@ -897,7 +897,6 @@ CONFIG_FB=y | |||
897 | # CONFIG_FB_SMIVGX is not set | 897 | # CONFIG_FB_SMIVGX is not set |
898 | # CONFIG_FB_CYBLA is not set | 898 | # CONFIG_FB_CYBLA is not set |
899 | # CONFIG_FB_TRIDENT is not set | 899 | # CONFIG_FB_TRIDENT is not set |
900 | # CONFIG_FB_E1356 is not set | ||
901 | # CONFIG_FB_S1D13XXX is not set | 900 | # CONFIG_FB_S1D13XXX is not set |
902 | # CONFIG_FB_VIRTUAL is not set | 901 | # CONFIG_FB_VIRTUAL is not set |
903 | 902 | ||
diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig index 2bc61ca4ba08..897420d39053 100644 --- a/arch/mips/configs/rbhma4500_defconfig +++ b/arch/mips/configs/rbhma4500_defconfig | |||
@@ -876,7 +876,6 @@ CONFIG_FB_ATY_CT=y | |||
876 | # CONFIG_FB_SMIVGX is not set | 876 | # CONFIG_FB_SMIVGX is not set |
877 | # CONFIG_FB_CYBLA is not set | 877 | # CONFIG_FB_CYBLA is not set |
878 | # CONFIG_FB_TRIDENT is not set | 878 | # CONFIG_FB_TRIDENT is not set |
879 | # CONFIG_FB_E1356 is not set | ||
880 | # CONFIG_FB_S1D13XXX is not set | 879 | # CONFIG_FB_S1D13XXX is not set |
881 | # CONFIG_FB_VIRTUAL is not set | 880 | # CONFIG_FB_VIRTUAL is not set |
882 | 881 | ||