[kernel] r14497 - in dists/trunk/linux-2.6/debian/config: mips mipsel

[Bastian Blank]

Author: waldi
Date: Thu Oct 29 11:19:43 2009
New Revision: 14497

Log:
* debian/config/mips/config.5kc-malta: Merge mipsel config.
* debian/config/mipsel/defines: Set config file location.
* debian/config/mipsel/config.5kc-malta: Remove.

Deleted:
   dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
Modified:
   dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
   dists/trunk/linux-2.6/debian/config/mipsel/defines

Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Thu Oct 29 11:05:14 2009	(r14496)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Thu Oct 29 11:19:43 2009	(r14497)
@@ -1056,6 +1056,7 @@
 # CONFIG_DM9000 is not set
 # CONFIG_HP100 is not set
 CONFIG_NET_PCI=y
+CONFIG_PCNET32=y
 CONFIG_AMD8111_ETH=m
 CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_B44=m
@@ -1242,7 +1243,7 @@
 ##
 ## file: drivers/rtc/Kconfig
 ##
-CONFIG_RTC_CLASS=m
+CONFIG_RTC_CLASS=y
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y

Modified: dists/trunk/linux-2.6/debian/config/mipsel/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/defines	Thu Oct 29 11:05:14 2009	(r14496)
+++ dists/trunk/linux-2.6/debian/config/mipsel/defines	Thu Oct 29 11:19:43 2009	(r14497)
@@ -29,3 +29,6 @@
 [5kc-malta_description]
 hardware: MIPS Malta (64-bit)
 hardware-long: MIPS Malta boards (64-bit)
+
+[5kc-malta_image]
+configs: mips/config.5kc-malta