---

yaml --- r: 261848 b: refs/heads/master c: 217bbd8 h: refs/heads/master v: v3
git-mirror · Jul 30, 2011 · a1ea4e3 · a1ea4e3
1 parent 06b98ae
commit a1ea4e3
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 299 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7785e954348465e1926d9c10ff3e49c207d4ec6
+refs/heads/master: 217bbd81885587b462311fab1b04172926c59f1e
diff --git a/trunk/arch/m68k/Kconfig.mmu b/trunk/arch/m68k/Kconfig.mmu
@@ -372,12 +372,6 @@ config AMIGA_PCMCIA
 	  Include support in the kernel for pcmcia on Amiga 1200 and Amiga
 	  600. If you intend to use pcmcia cards say Y; otherwise say N.
 
-config STRAM_PROC
-	bool "ST-RAM statistics in /proc"
-	depends on ATARI
-	help
-	  Say Y here to report ST-RAM usage statistics in /proc/stram.
-
 config HEARTBEAT
 	bool "Use power LED as a heartbeat" if AMIGA || APOLLO || ATARI || MAC ||Q40
 	default y if !AMIGA && !APOLLO && !ATARI && !MAC && !Q40 && HP300