[kernel] r16737 - in dists/trunk/linux-2.6/debian: . patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Sat Dec 25 16:20:03 2010
New Revision: 16737

Log:
[ia64] drm/nouveau: Revert unnecessary exclusion of ACPI support code

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/bugfix/all/drm-nouveau-Only-select-ACPI_VIDEO-if-its-dependenci.patch

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Fri Dec 24 16:48:47 2010	(r16736)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Dec 25 16:20:03 2010	(r16737)
@@ -22,6 +22,7 @@
   * debian/bin/test-patches: Restrict patches to featureset when building
     with a featureset (thanks to Tim Small)
   * Recommend use of 'make deb-pkg' to build custom kernel packages
+  * [ia64] drm/nouveau: Revert unnecessary exclusion of ACPI support code
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 11 Dec 2010 21:21:10 +0000
 

Modified: dists/trunk/linux-2.6/debian/patches/bugfix/all/drm-nouveau-Only-select-ACPI_VIDEO-if-its-dependenci.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/all/drm-nouveau-Only-select-ACPI_VIDEO-if-its-dependenci.patch	Fri Dec 24 16:48:47 2010	(r16736)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/drm-nouveau-Only-select-ACPI_VIDEO-if-its-dependenci.patch	Sat Dec 25 16:20:03 2010	(r16737)
@@ -1,7 +1,7 @@
-From 778b1b6b848d046ac1566b36c8b39c4cda9f8c35 Mon Sep 17 00:00:00 2001
+From 9af906ea7a41ecd3de88edb95c4e8a659d273db2 Mon Sep 17 00:00:00 2001
 From: Ben Hutchings <ben at decadent.org.uk>
 Date: Sat, 11 Dec 2010 06:13:45 +0000
-Subject: [PATCH 3/4] drm/nouveau: Only select ACPI_VIDEO if its dependencies are met
+Subject: [PATCH] drm/nouveau: Only select ACPI_VIDEO if its dependencies are met
 
 CONFIG_ACPI_VIDEO depends on more than just CONFIG_ACPI, so add those
 dependencies to the Kconfig select condition and make the code
@@ -9,11 +9,8 @@
 
 Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
 ---
- drivers/gpu/drm/nouveau/Kconfig             |    2 +-
- drivers/gpu/drm/nouveau/Makefile            |    2 +-
- drivers/gpu/drm/nouveau/nouveau_backlight.c |    2 +-
- drivers/gpu/drm/nouveau/nouveau_drv.h       |    2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
+ drivers/gpu/drm/nouveau/Kconfig |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
 index 72730e9..21d6c29 100644
@@ -28,44 +25,6 @@
  	help
  	  Choose this option for open-source nVidia support.
  
-diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
-index 23fa82d..101a0f6 100644
---- a/drivers/gpu/drm/nouveau/Makefile
-+++ b/drivers/gpu/drm/nouveau/Makefile
-@@ -30,6 +30,6 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \
- nouveau-$(CONFIG_DRM_NOUVEAU_DEBUG) += nouveau_debugfs.o
- nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
- nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
--nouveau-$(CONFIG_ACPI) += nouveau_acpi.o
-+nouveau-$(CONFIG_ACPI_VIDEO) += nouveau_acpi.o
- 
- obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
-diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
-index b14c811..6f3f463 100644
---- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
-@@ -137,7 +137,7 @@ int nouveau_backlight_init(struct drm_device *dev)
- {
- 	struct drm_nouveau_private *dev_priv = dev->dev_private;
- 
--#ifdef CONFIG_ACPI
-+#ifdef CONFIG_ACPI_VIDEO
- 	if (acpi_video_backlight_support()) {
- 		NV_INFO(dev, "ACPI backlight interface available, "
- 			     "not registering our own\n");
-diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
-index 1c7db64..a18d0ed 100644
---- a/drivers/gpu/drm/nouveau/nouveau_drv.h
-+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
-@@ -894,7 +894,7 @@ extern int  nouveau_dma_wait(struct nouveau_channel *, int slots, int size);
- 
- /* nouveau_acpi.c */
- #define ROM_BIOS_PAGE 4096
--#if defined(CONFIG_ACPI)
-+#if defined(CONFIG_ACPI_VIDEO)
- void nouveau_register_dsm_handler(void);
- void nouveau_unregister_dsm_handler(void);
- int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len);
 -- 
 1.7.2.3