[kernel] r7862 - in dists/sid/linux-2.6/debian: arch/m68k patches

[Christian T. Steigies]

Author: cts
Date: Mon Nov 20 11:34:47 2006
New Revision: 7862

Modified:
   dists/sid/linux-2.6/debian/arch/m68k/config.atari
   dists/sid/linux-2.6/debian/arch/m68k/defines
   dists/sid/linux-2.6/debian/patches/m68k-atari-ethernet.patch
Log:
do not build atari ethernet as module, enable building for atari


Modified: dists/sid/linux-2.6/debian/arch/m68k/config.atari
==============================================================================
--- dists/sid/linux-2.6/debian/arch/m68k/config.atari	(original)
+++ dists/sid/linux-2.6/debian/arch/m68k/config.atari	Mon Nov 20 11:34:47 2006
@@ -109,6 +109,6 @@
 # CONFIG_ATARI_SCSI is not set
 # enable ethernet
 CONFIG_NET_ETHERNET=y
-CONFIG_ATARILANCE=m
-CONFIG_ATARI_NFETH=m
-CONFIG_ATARI_ETHERNEC=m
+CONFIG_ATARILANCE=y
+CONFIG_ATARI_NFETH=y
+CONFIG_ATARI_ETHERNEC=y

Modified: dists/sid/linux-2.6/debian/arch/m68k/defines
==============================================================================
--- dists/sid/linux-2.6/debian/arch/m68k/defines	(original)
+++ dists/sid/linux-2.6/debian/arch/m68k/defines	Mon Nov 20 11:34:47 2006
@@ -2,7 +2,7 @@
 compiler: gcc-3.3
 flavours:
  amiga
-# atari
+ atari
 # bvme6000
 # hp
  mac

Modified: dists/sid/linux-2.6/debian/patches/m68k-atari-ethernet.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/m68k-atari-ethernet.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/m68k-atari-ethernet.patch	Mon Nov 20 11:34:47 2006
@@ -1936,7 +1936,7 @@
 +	// int err;
 +
 +	if (IS_ERR(atari_nfeth_dev = atari_nfeth_probe(0))) {
-+		return PTR_ERR((atarilance_dev);
++		return PTR_ERR((atari_nfeth_dev);
 +	}
 +
 +	// ? atari_nfeth_dev.init = atari_nfeth_probe;