[kernel] r18033 - in dists/sid/linux-2.6/debian: . patches/bugfix/alpha patches/series

[Ben Hutchings]

Author: benh
Date: Mon Aug 29 13:30:57 2011
New Revision: 18033

Log:
[alpha] Disable GENERIC_GPIO (Closes: #638696)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/alpha/
   dists/sid/linux-2.6/debian/patches/bugfix/alpha/alpha-gpio-GENERIC_GPIO-default-must-be-n.patch
   dists/sid/linux-2.6/debian/patches/series/4
Modified:
   dists/sid/linux-2.6/debian/changelog

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Aug 29 13:25:28 2011	(r18032)
+++ dists/sid/linux-2.6/debian/changelog	Mon Aug 29 13:30:57 2011	(r18033)
@@ -2,6 +2,7 @@
 
   [ Ben Hutchings ]
   * Make bug script accept failure of lspci (Closes: #639439)
+  * [alpha] Disable GENERIC_GPIO (Closes: #638696)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 28 Aug 2011 17:07:47 +0100
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/alpha/alpha-gpio-GENERIC_GPIO-default-must-be-n.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/alpha/alpha-gpio-GENERIC_GPIO-default-must-be-n.patch	Mon Aug 29 13:30:57 2011	(r18033)
@@ -0,0 +1,29 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 28 Aug 2011 21:45:13 +0100
+Subject: [PATCH] alpha, gpio: GENERIC_GPIO default must be n
+
+Since GPIOLIB is optional on alpha, GENERIC_GPIO must not be
+selected by default.  If GPIOLIB is enabled, it will select
+GENERIC_GPIO.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ arch/alpha/Kconfig |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
+index 60cde53..8bb9362 100644
+--- a/arch/alpha/Kconfig
++++ b/arch/alpha/Kconfig
+@@ -51,7 +51,7 @@ config GENERIC_CMOS_UPDATE
+         def_bool y
+ 
+ config GENERIC_GPIO
+-	def_bool y
++	bool
+ 
+ config ZONE_DMA
+ 	bool
+-- 
+1.7.5.4
+

Added: dists/sid/linux-2.6/debian/patches/series/4
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/series/4	Mon Aug 29 13:30:57 2011	(r18033)
@@ -0,0 +1 @@
++ bugfix/alpha/alpha-gpio-GENERIC_GPIO-default-must-be-n.patch