[kernel] r14494 - in dists/trunk/linux-2.6/debian/config: amd64 i386 kernelarch-x86

[Bastian Blank]

Author: waldi
Date: Thu Oct 29 10:52:17 2009
New Revision: 14494

Log:
* debian/config/amd64/config.amd64: Remove empty file.
* debian/config/amd64/defines, debian/config/i386/defines:
  Update config file selection.
* debian/config/kernelarch-x86/config-arch-64:
  Merge missing arch specific stuff.

Deleted:
   dists/trunk/linux-2.6/debian/config/amd64/config.amd64
Modified:
   dists/trunk/linux-2.6/debian/config/amd64/defines
   dists/trunk/linux-2.6/debian/config/i386/defines
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64

Modified: dists/trunk/linux-2.6/debian/config/amd64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/defines	Thu Oct 29 10:50:03 2009	(r14493)
+++ dists/trunk/linux-2.6/debian/config/amd64/defines	Thu Oct 29 10:52:17 2009	(r14494)
@@ -20,4 +20,3 @@
 [amd64_image]
 configs:
  kernelarch-x86/config-arch-64
- amd64/config.amd64

Modified: dists/trunk/linux-2.6/debian/config/i386/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/defines	Thu Oct 29 10:50:03 2009	(r14493)
+++ dists/trunk/linux-2.6/debian/config/i386/defines	Thu Oct 29 10:52:17 2009	(r14494)
@@ -50,6 +50,5 @@
 [amd64_image]
 configs:
  kernelarch-x86/config-arch-64
- amd64/config.amd64
 recommends: libc6-i686
 

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Thu Oct 29 10:50:03 2009	(r14493)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Thu Oct 29 10:52:17 2009	(r14494)
@@ -51,6 +51,7 @@
 ##
 ## file: drivers/char/Kconfig
 ##
+CONFIG_DIGIEPCA=m
 CONFIG_MOXA_INTELLIO=m
 CONFIG_ISI=m
 CONFIG_SPECIALIX=m
@@ -116,6 +117,8 @@
 ## file: drivers/video/Kconfig
 ##
 # CONFIG_FB_NVIDIA_I2C is not set
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_MAVEN=m
 # CONFIG_FB_ATY_GENERIC_LCD is not set
 # CONFIG_FB_SAVAGE_I2C is not set