[kernel] r17764 - in dists/trunk/linux-2.6/debian: . config/kernelarch-x86

[Maximilian Attems]

Author: maks
Date: Tue Jun 28 15:37:22 2011
New Revision: 17764

Log:
fix I2C_PXA is x86_32 specific

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Tue Jun 28 14:42:38 2011	(r17763)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Jun 28 15:37:22 2011	(r17764)
@@ -6,7 +6,8 @@
     SENSORS_ADS1015, SENSORS_W83795, SENSORS_DS620, SENSORS_LINEAGE,
     SENSORS_LTC4151, SENSORS_LTC4261, SENSORS_MAX16065, SENSORS_MAX6639,
     SENSORS_MAX6642.
-  * [x86] enable modular I2C_PXA, SENSORS_FAM15H_POWER.
+  * [x86_32] enable modular I2C_PXA.
+  * [x86] enable modular SENSORS_FAM15H_POWER.
 
  -- maximilian attems <maks at debian.org>  Tue, 28 Jun 2011 12:10:21 +0200
 

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Tue Jun 28 14:42:38 2011	(r17763)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Tue Jun 28 15:37:22 2011	(r17764)
@@ -497,7 +497,6 @@
 CONFIG_I2C_VIA=m
 CONFIG_I2C_VIAPRO=m
 CONFIG_I2C_SCMI=m
-CONFIG_I2C_PXA=m
 CONFIG_I2C_PARPORT=m
 CONFIG_I2C_PARPORT_LIGHT=m
 CONFIG_I2C_PCA_ISA=m

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Tue Jun 28 14:42:38 2011	(r17763)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Tue Jun 28 15:37:22 2011	(r17764)
@@ -147,6 +147,7 @@
 CONFIG_SCx200_I2C=m
 CONFIG_SCx200_I2C_SCL=12
 CONFIG_SCx200_I2C_SDA=13
+CONFIG_I2C_PXA=m
 
 ##
 ## file: drivers/ide/Kconfig