[kernel] r13072 - in dists/trunk/linux-2.6/debian: . config config/amd64 config/i386

[Maximilian Attems]

Author: maks
Date: Tue Mar 10 13:41:35 2009
New Revision: 13072

Log:
make comedi x86 only

crap staging driver effecitvely breaks builds on ppc for example:
build/linux-2.6-2.6.29~rc7/debian/build/source_powerpc_none/drivers/staging/comedi/drivers.c: In function 'comedi_buf_alloc':
/build/linux-2.6-2.6.29~rc7/debian/build/source_powerpc_none/drivers/staging/comedi/drivers.c:497: error: 'PAGE_KERNEL_NOCACHE' undeclared (first use in this function)
/build/linux-2.6-2.6.29~rc7/debian/build/source_powerpc_none/drivers/staging/comedi/drivers.c:497: error: (Each undeclared identifier is reported only once
/build/linux-2.6-2.6.29~rc7/debian/build/source_powerpc_none/drivers/staging/comedi/drivers.c:497: error: for each function it appears in.)
make[8]: *** [drivers/staging/comedi/drivers.o] Error 1

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/i386/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Mar 10 13:41:35 2009
@@ -27,10 +27,10 @@
     USB_SERIAL_OPTICON, LEDS_ALIX2, LEDS_WM8350, OCFS2_FS_POSIX_ACL,
     BTRFS_FS_POSIX_ACL, ATM_SOLOS, MFD_PCF50633, PCF50633_ADC, PCF50633_GPIO,
     REGULATOR_PCF50633, DVB_S921, EDAC_I5400, RTC_DRV_PCF50633,
-    INPUT_PCF50633_PMU, CHARGER_PCF50633, COMEDI.
+    INPUT_PCF50633_PMU, CHARGER_PCF50633.
   * topconfig enable SND_HDA_HWDEP for sound debugging purpose.
   * topconfig enable USB_HIDDEV (closes: #517771)
-  * [x86] set DELL_LAPTOP.
+  * [x86] set DELL_LAPTOP, COMEDI.
   * [x86] unset DRM_I915_KMS due to upgrade path from Lenny override with
     modeset module param.
 

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Tue Mar 10 13:41:35 2009
@@ -1164,6 +1164,13 @@
 CONFIG_SERIAL_JSM=m
 
 ##
+## file: drivers/staging/Kconfig
+##
+CONFIG_COMEDI=m
+CONFIG_COMEDI_PCI_DRIVERS=m
+CONFIG_COMEDI_USB_DRIVERS=m
+
+##
 ## file: drivers/telephony/Kconfig
 ##
 CONFIG_PHONE=m

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	(original)
+++ dists/trunk/linux-2.6/debian/config/config	Tue Mar 10 13:41:35 2009
@@ -1806,9 +1806,7 @@
 CONFIG_RT2860=m
 CONFIG_RT2870=m
 # CONFIG_BENET is not set
-CONFIG_COMEDI=m
-CONFIG_COMEDI_PCI_DRIVERS=m
-CONFIG_COMEDI_USB_DRIVERS=m
+# CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 # CONFIG_PANEL is not set
 # CONFIG_ALTERA_PCIE_CHDMA is not set

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Tue Mar 10 13:41:35 2009
@@ -1401,6 +1401,13 @@
 CONFIG_SERIAL_JSM=m
 
 ##
+### file: drivers/staging/Kconfig
+###
+CONFIG_COMEDI=m
+CONFIG_COMEDI_PCI_DRIVERS=m
+CONFIG_COMEDI_USB_DRIVERS=m
+
+##
 ## file: drivers/telephony/Kconfig
 ##
 CONFIG_PHONE=m