[kernel] r8461 - in dists/sid/linux-2.6/debian: . arch/hppa

[Dann Frazier]

Author: dannf
Date: Tue Apr 10 20:01:58 2007
New Revision: 8461

Modified:
   dists/sid/linux-2.6/debian/arch/hppa/config
   dists/sid/linux-2.6/debian/changelog
Log:
merge in r8387 from 2.6.18: "Enable CONFIG_TULIP_MMIO on hppa. (closes: #332962)"

Modified: dists/sid/linux-2.6/debian/arch/hppa/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/hppa/config	(original)
+++ dists/sid/linux-2.6/debian/arch/hppa/config	Tue Apr 10 20:01:58 2007
@@ -307,7 +307,7 @@
 # CONFIG_DE2104X is not set
 CONFIG_TULIP=m
 # CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
+CONFIG_TULIP_MMIO=y
 # CONFIG_DE4X5 is not set
 # CONFIG_WINBOND_840 is not set
 # CONFIG_DM9102 is not set

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue Apr 10 20:01:58 2007
@@ -6,6 +6,7 @@
 
   [ dann frazier ]
   * [hppa] Add parisc arch patch from Kyle McMartin
+  * Enable CONFIG_TULIP_MMIO on hppa. (closes: #332962)
 
  -- dann frazier <dannf at debian.org>  Tue, 10 Apr 2007 13:53:11 -0600