---

yaml --- r: 114241 b: refs/heads/master c: 2171a19 h: refs/heads/master i: 114239: 53db01d v: v3
git-mirror · Oct 14, 2008 · d648d95 · d648d95
1 parent c23a8c1
commit d648d95
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 631 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29c8a24672e1cdfee99c15b870c57eb30ae69daf
+refs/heads/master: 2171a19a246551dac7805faa077075f7222507ac
diff --git a/trunk/arch/m68k/Kconfig b/trunk/arch/m68k/Kconfig
@@ -122,10 +122,6 @@ config ATARI
 	  this kernel on an Atari, say Y here and browse the material
 	  available in <file:Documentation/m68k>; otherwise say N.
 
-config PCI
-	bool
-	help
-
 config MAC
 	bool "Macintosh support"
 	select MMU_MOTOROLA if MMU

diff --git a/trunk/arch/m68k/kernel/Makefile b/trunk/arch/m68k/kernel/Makefile
@@ -14,5 +14,4 @@ obj-y	:= entry.o process.o traps.o ints.o signal.o ptrace.o module.o \
 
 devres-y = ../../../kernel/irq/devres.o
 
-obj-$(CONFIG_PCI)	+= bios32.o
 obj-y$(CONFIG_MMU_SUN3) += dma.o	# no, it's not a typo
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,5 +14,4 @@ obj-y := entry.o process.o traps.o ints.o signal.o ptrace.o module.o \

		devres-y = ../../../kernel/irq/devres.o

		obj-$(CONFIG_PCI) += bios32.o
		obj-y$(CONFIG_MMU_SUN3) += dma.o # no, it's not a typo