From 8f0eaeaba8b8a8c0c48b3f34894ad4d743e41cb6 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 29 Aug 2011 13:30:57 +0000 Subject: [PATCH] [alpha] Disable GENERIC_GPIO (Closes: #638696) svn path=/dists/sid/linux-2.6/; revision=18033 --- debian/changelog | 1 + ...-gpio-GENERIC_GPIO-default-must-be-n.patch | 29 +++++++++++++++++++ debian/patches/series/4 | 1 + 3 files changed, 31 insertions(+) create mode 100644 debian/patches/bugfix/alpha/alpha-gpio-GENERIC_GPIO-default-must-be-n.patch create mode 100644 debian/patches/series/4 diff --git a/debian/changelog b/debian/changelog index dfe49743c..0318849ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ linux-2.6 (3.0.0-4) UNRELEASED; urgency=low [ Ben Hutchings ] * Make bug script accept failure of lspci (Closes: #639439) + * [alpha] Disable GENERIC_GPIO (Closes: #638696) -- Ben Hutchings Sun, 28 Aug 2011 17:07:47 +0100 diff --git a/debian/patches/bugfix/alpha/alpha-gpio-GENERIC_GPIO-default-must-be-n.patch b/debian/patches/bugfix/alpha/alpha-gpio-GENERIC_GPIO-default-must-be-n.patch new file mode 100644 index 000000000..ffdb10115 --- /dev/null +++ b/debian/patches/bugfix/alpha/alpha-gpio-GENERIC_GPIO-default-must-be-n.patch @@ -0,0 +1,29 @@ +From: Ben Hutchings +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 +--- + 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 + diff --git a/debian/patches/series/4 b/debian/patches/series/4 new file mode 100644 index 000000000..0c11a4b9c --- /dev/null +++ b/debian/patches/series/4 @@ -0,0 +1 @@ ++ bugfix/alpha/alpha-gpio-GENERIC_GPIO-default-must-be-n.patch