linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] m68k: Revive lost ARAnyM config options
@ 2011-10-25 20:05 Geert Uytterhoeven
  2011-10-26  0:22 ` Greg Ungerer
  0 siblings, 1 reply; 2+ messages in thread
From: Geert Uytterhoeven @ 2011-10-25 20:05 UTC (permalink / raw)
  To: Greg Ungerer, linux-m68k; +Cc: Greg Ungerer, linux-kernel, Geert Uytterhoeven

commit 0e152d80507b75c00aac60f2ffc586360687cd52 ("m68k: reorganize Kconfig
options to improve mmu/non-mmu selections") accidentally dropped the ARAnyM
config options. Re-add them to the "Platform devices" section.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 arch/m68k/Kconfig.devices |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices
index 82ddb93..5cf1c54 100644
--- a/arch/m68k/Kconfig.devices
+++ b/arch/m68k/Kconfig.devices
@@ -24,6 +24,37 @@ config PROC_HARDWARE
 	  including the model, CPU, MMU, clock speed, BogoMIPS rating,
 	  and memory size.
 
+config NATFEAT
+	bool "ARAnyM emulator support"
+	depends on ATARI
+	help
+	  This option enables support for ARAnyM native features, such as
+	  access to a disk image as /dev/hda.
+
+config NFBLOCK
+	tristate "NatFeat block device support"
+	depends on BLOCK && NATFEAT
+	help
+	  Say Y to include support for the ARAnyM NatFeat block device
+	  which allows direct access to the hard drives without using
+	  the hardware emulation.
+
+config NFCON
+	tristate "NatFeat console driver"
+	depends on NATFEAT
+	help
+	  Say Y to include support for the ARAnyM NatFeat console driver
+	  which allows the console output to be redirected to the stderr
+	  output of ARAnyM.
+
+config NFETH
+	tristate "NatFeat Ethernet support"
+	depends on ETHERNET && NATFEAT
+	help
+	  Say Y to include support for the ARAnyM NatFeat network device
+	  which will emulate a regular ethernet device while presenting an
+	  ethertap device to the host system.
+
 endmenu
 
 menu "Character devices"
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] m68k: Revive lost ARAnyM config options
  2011-10-25 20:05 [PATCH] m68k: Revive lost ARAnyM config options Geert Uytterhoeven
@ 2011-10-26  0:22 ` Greg Ungerer
  0 siblings, 0 replies; 2+ messages in thread
From: Greg Ungerer @ 2011-10-26  0:22 UTC (permalink / raw)
  To: Geert Uytterhoeven; +Cc: Greg Ungerer, linux-m68k, linux-kernel

Hi Geert,

On 26/10/11 06:05, Geert Uytterhoeven wrote:
> commit 0e152d80507b75c00aac60f2ffc586360687cd52 ("m68k: reorganize Kconfig
> options to improve mmu/non-mmu selections") accidentally dropped the ARAnyM
> config options. Re-add them to the "Platform devices" section.

Sorry, my fault.


> Signed-off-by: Geert Uytterhoeven<geert@linux-m68k.org>

Acked-by: Greg Ungerer <gerg@uclinux.org>

Regards
Greg


>   arch/m68k/Kconfig.devices |   31 +++++++++++++++++++++++++++++++
>   1 files changed, 31 insertions(+), 0 deletions(-)
>
> diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices
> index 82ddb93..5cf1c54 100644
> --- a/arch/m68k/Kconfig.devices
> +++ b/arch/m68k/Kconfig.devices
> @@ -24,6 +24,37 @@ config PROC_HARDWARE
>   	  including the model, CPU, MMU, clock speed, BogoMIPS rating,
>   	  and memory size.
>
> +config NATFEAT
> +	bool "ARAnyM emulator support"
> +	depends on ATARI
> +	help
> +	  This option enables support for ARAnyM native features, such as
> +	  access to a disk image as /dev/hda.
> +
> +config NFBLOCK
> +	tristate "NatFeat block device support"
> +	depends on BLOCK&&  NATFEAT
> +	help
> +	  Say Y to include support for the ARAnyM NatFeat block device
> +	  which allows direct access to the hard drives without using
> +	  the hardware emulation.
> +
> +config NFCON
> +	tristate "NatFeat console driver"
> +	depends on NATFEAT
> +	help
> +	  Say Y to include support for the ARAnyM NatFeat console driver
> +	  which allows the console output to be redirected to the stderr
> +	  output of ARAnyM.
> +
> +config NFETH
> +	tristate "NatFeat Ethernet support"
> +	depends on ETHERNET&&  NATFEAT
> +	help
> +	  Say Y to include support for the ARAnyM NatFeat network device
> +	  which will emulate a regular ethernet device while presenting an
> +	  ethertap device to the host system.
> +
>   endmenu
>
>   menu "Character devices"


-- 
------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg@snapgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close                             FAX:         +61 7 3217 5323
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-10-26  0:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-25 20:05 [PATCH] m68k: Revive lost ARAnyM config options Geert Uytterhoeven
2011-10-26  0:22 ` Greg Ungerer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).