Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2919b510 authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

[PATCH] frv: suppress configuration of certain features for FRV



Suppress configuration of certain features for the FRV arch as they can't be
built for FRV at the moment:

 (*) RTC

 (*) HISAX_*

 (*) PARPORT_PC

 (*) VGA_CONSOLE

 (*) BINFMT_ELF

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 277cb103
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -687,7 +687,7 @@ config NVRAM


config RTC
config RTC
	tristate "Enhanced Real Time Clock Support"
	tristate "Enhanced Real Time Clock Support"
	depends on !PPC32 && !PARISC && !IA64 && !M68K && (!SPARC || PCI)
	depends on !PPC32 && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV
	---help---
	---help---
	  If you say Y here and create a character special file /dev/rtc with
	  If you say Y here and create a character special file /dev/rtc with
	  major number 10 and minor number 135 using mknod ("man mknod"), you
	  major number 10 and minor number 135 using mknod ("man mknod"), you
@@ -735,7 +735,7 @@ config SGI_IP27_RTC


config GEN_RTC
config GEN_RTC
	tristate "Generic /dev/rtc emulation"
	tristate "Generic /dev/rtc emulation"
	depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC
	depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC && !FRV
	---help---
	---help---
	  If you say Y here and create a character special file /dev/rtc with
	  If you say Y here and create a character special file /dev/rtc with
	  major number 10 and minor number 135 using mknod ("man mknod"), you
	  major number 10 and minor number 135 using mknod ("man mknod"), you
+5 −5
Original line number Original line Diff line number Diff line
@@ -110,7 +110,7 @@ config HISAX_16_3


config HISAX_TELESPCI
config HISAX_TELESPCI
	bool "Teles PCI"
	bool "Teles PCI"
	depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K))
	depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || FRV))
	help
	help
	  This enables HiSax support for the Teles PCI.
	  This enables HiSax support for the Teles PCI.
	  See <file:Documentation/isdn/README.HiSax> on how to configure it.
	  See <file:Documentation/isdn/README.HiSax> on how to configure it.
@@ -238,7 +238,7 @@ config HISAX_MIC


config HISAX_NETJET
config HISAX_NETJET
	bool "NETjet card"
	bool "NETjet card"
	depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K))
	depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || FRV))
	help
	help
	  This enables HiSax support for the NetJet from Traverse
	  This enables HiSax support for the NetJet from Traverse
	  Technologies.
	  Technologies.
@@ -249,7 +249,7 @@ config HISAX_NETJET


config HISAX_NETJET_U
config HISAX_NETJET_U
	bool "NETspider U card"
	bool "NETspider U card"
	depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K))
	depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || FRV))
	help
	help
	  This enables HiSax support for the Netspider U interface ISDN card
	  This enables HiSax support for the Netspider U interface ISDN card
	  from Traverse Technologies.
	  from Traverse Technologies.
@@ -317,7 +317,7 @@ config HISAX_GAZEL


config HISAX_HFC_PCI
config HISAX_HFC_PCI
	bool "HFC PCI-Bus cards"
	bool "HFC PCI-Bus cards"
	depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K))
	depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || FRV))
	help
	help
	  This enables HiSax support for the HFC-S PCI 2BDS0 based cards.
	  This enables HiSax support for the HFC-S PCI 2BDS0 based cards.


@@ -344,7 +344,7 @@ config HISAX_HFC_SX


config HISAX_ENTERNOW_PCI
config HISAX_ENTERNOW_PCI
	bool "Formula-n enter:now PCI card"
	bool "Formula-n enter:now PCI card"
	depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K))
	depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || FRV))
	help
	help
	  This enables HiSax support for the Formula-n enter:now PCI
	  This enables HiSax support for the Formula-n enter:now PCI
	  ISDN card.
	  ISDN card.
+1 −1
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ config PARPORT


config PARPORT_PC
config PARPORT_PC
	tristate "PC-style hardware"
	tristate "PC-style hardware"
	depends on PARPORT && (!SPARC64 || PCI) && !SPARC32 && !M32R
	depends on PARPORT && (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV
	---help---
	---help---
	  You should say Y here if you have a PC-style parallel port. All
	  You should say Y here if you have a PC-style parallel port. All
	  IBM PC compatible computers and some Alphas have PC-style
	  IBM PC compatible computers and some Alphas have PC-style
+1 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ menu "Console display driver support"


config VGA_CONSOLE
config VGA_CONSOLE
	bool "VGA text console" if EMBEDDED || !X86
	bool "VGA text console" if EMBEDDED || !X86
	depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !ARCH_VERSATILE
	depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !ARCH_VERSATILE
	default y
	default y
	help
	help
	  Saying Y here will allow you to use Linux in text mode through a
	  Saying Y here will allow you to use Linux in text mode through a
+1 −1
Original line number Original line Diff line number Diff line
config BINFMT_ELF
config BINFMT_ELF
	bool "Kernel support for ELF binaries"
	bool "Kernel support for ELF binaries"
	depends on MMU
	depends on MMU && (BROKEN || !FRV)
	default y
	default y
	---help---
	---help---
	  ELF (Executable and Linkable Format) is a format for libraries and
	  ELF (Executable and Linkable Format) is a format for libraries and