[kernel] r14085 - in dists/trunk/linux-2.6/debian: . config config/alpha config/amd64 config/i386 config/mipsel config/powerpc

[Maximilian Attems]

Author: maks
Date: Wed Aug  5 13:56:58 2009
New Revision: 14085

Log:
Revert "disable oldstyle pc speaker driver"

as bwh says people prefer old style "beep" then alsa dev.

This reverts commit 539d94a775c27eddd9cdc35ceef869ed01080cb5.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/alpha/config
   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
   dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
   dists/trunk/linux-2.6/debian/config/powerpc/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Wed Aug  5 13:56:43 2009	(r14084)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Aug  5 13:56:58 2009	(r14085)
@@ -35,7 +35,6 @@
   * Allow install in chroot without do_initrd check for piuparts.
   * Cleanup Maintainer scripts from ancient pre linux-2.6 assumptions.
   * Disable DEVKMEM.
-  * Disable INPUT_PCSPKR as replaced by snd-pcsp.
 
   [ Ben Hutchings ]
   * mga: remove unnecessary change from firmware-loading patch

Modified: dists/trunk/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/config	Wed Aug  5 13:56:43 2009	(r14084)
+++ dists/trunk/linux-2.6/debian/config/alpha/config	Wed Aug  5 13:56:58 2009	(r14085)
@@ -350,6 +350,7 @@
 ## file: drivers/input/misc/Kconfig
 ##
 CONFIG_INPUT_MISC=y
+CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	Wed Aug  5 13:56:43 2009	(r14084)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Wed Aug  5 13:56:58 2009	(r14085)
@@ -342,6 +342,7 @@
 ## file: drivers/input/misc/Kconfig
 ##
 CONFIG_INPUT_MISC=y
+CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_UINPUT=m

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Wed Aug  5 13:56:43 2009	(r14084)
+++ dists/trunk/linux-2.6/debian/config/config	Wed Aug  5 13:56:58 2009	(r14085)
@@ -563,7 +563,6 @@
 ##
 ## file: drivers/input/misc/Kconfig
 ##
-# CONFIG_INPUT_PCSPKR is not set
 CONFIG_INPUT_ATI_REMOTE=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	Wed Aug  5 13:56:43 2009	(r14084)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Wed Aug  5 13:56:58 2009	(r14085)
@@ -374,6 +374,7 @@
 ## file: drivers/input/misc/Kconfig
 ##
 CONFIG_INPUT_MISC=y
+CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_WISTRON_BTNS=m
 CONFIG_INPUT_ATLAS_BTNS=m

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt	Wed Aug  5 13:56:43 2009	(r14084)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt	Wed Aug  5 13:56:58 2009	(r14085)
@@ -232,6 +232,7 @@
 ## file: drivers/input/misc/Kconfig
 ##
 CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_PCSPKR is not set
 CONFIG_INPUT_COBALT_BTNS=m
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config	Wed Aug  5 13:56:43 2009	(r14084)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config	Wed Aug  5 13:56:58 2009	(r14085)
@@ -330,6 +330,7 @@
 ## file: drivers/input/misc/Kconfig
 ##
 CONFIG_INPUT_MISC=y
+CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
 
 ##