[kernel] r8753 - in dists/trunk/linux-2.6/debian: . arch

[Maximilian Attems]

Author: maks
Date: Thu May 24 17:14:26 2007
New Revision: 8753

Log:
be more explicit on spi variable,
set the spi protocol master at25
spidev is labelled experimental might need to be enabled at later times..


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

Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/config	Thu May 24 17:14:26 2007
@@ -276,12 +276,18 @@
 CONFIG_SPI_MASTER=y
 
 #
-# SPI support
+# SPI Master Controller Drivers
 #
 CONFIG_SPI_BITBANG=m
 CONFIG_SPI_BUTTERFLY=m
 
 #
+# SPI Protocol Masters
+#
+CONFIG_SPI_AT25=m
+# CONFIG_SPI_SPIDEV is not set
+
+#
 # 1-wire Slaves
 #
 CONFIG_W1_SLAVE_THERM=m

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu May 24 17:14:26 2007
@@ -8,7 +8,8 @@
   * Cleanup configs of old unused variables.
   * Enable TCP_CONG_YEAH, TCP_CONG_ILLINOIS, NF_CONNTRACK_SANE, DM_DELAY,
     GIGASET_M101, SATA_INIC162X, VIDEO_IVTV, USB_ZR364XX, INFINIBAND_CXGB3,
-    MLX4_INFINIBAND and disable SCSI_ESP_CORE in topconfig.
+    MLX4_INFINIBAND, SPI_AT25 and disable SCSI_ESP_CORE, SPI_SPIDEV
+    in topconfig.
   * [amd64, i386]: Take care of the renaming acpi-ibm to thinkpad-acpi.
     Enable KINGSUN_DONGLE, AF_RXRPC, RXKAD, MTD_NAND_PLATFORM, BLINK, PHANTOM.
     Disable OSS_OBSOLETE.
@@ -27,7 +28,7 @@
   [ dann frazier ]
   * Add Xen licensing info to the copyright file. (closes: #368912)
 
- -- maximilian attems <maks at debian.org>  Thu, 24 May 2007 11:18:21 +0200
+ -- maximilian attems <maks at debian.org>  Thu, 24 May 2007 19:13:58 +0200
 
 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low