[kernel] r19709 - in dists/trunk/linux/debian: . patches/bugfix/ia64

[Ben Hutchings]

Author: benh
Date: Sun Jan  6 04:40:13 2013
New Revision: 19709

Log:
[ia64] nouveau: Disable another bit of ACPI support (fixes FTBFS)

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/patches/bugfix/ia64/nouveau-ACPI-support-is-dependent-on-X86.patch

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sun Jan  6 04:34:49 2013	(r19708)
+++ dists/trunk/linux/debian/changelog	Sun Jan  6 04:40:13 2013	(r19709)
@@ -1,3 +1,10 @@
+linux (3.7.1-1~experimental.3) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * [ia64] nouveau: Disable another bit of ACPI support (fixes FTBFS)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sun, 06 Jan 2013 04:39:12 +0000
+
 linux (3.7.1-1~experimental.2) experimental; urgency=low
 
   [ Ben Hutchings ]

Modified: dists/trunk/linux/debian/patches/bugfix/ia64/nouveau-ACPI-support-is-dependent-on-X86.patch
==============================================================================
--- dists/trunk/linux/debian/patches/bugfix/ia64/nouveau-ACPI-support-is-dependent-on-X86.patch	Sun Jan  6 04:34:49 2013	(r19708)
+++ dists/trunk/linux/debian/patches/bugfix/ia64/nouveau-ACPI-support-is-dependent-on-X86.patch	Sun Jan  6 04:40:13 2013	(r19709)
@@ -49,3 +49,14 @@
  void nouveau_register_dsm_handler(void);
  void nouveau_unregister_dsm_handler(void);
  void nouveau_switcheroo_optimus_dsm(void);
+--- a/drivers/gpu/drm/nouveau/core/subdev/bios/base.c
++++ b/drivers/gpu/drm/nouveau/core/subdev/bios/base.c
+@@ -172,7 +172,7 @@ out:
+ 	nv_wr32(bios, pcireg, access);
+ }
+ 
+-#if defined(CONFIG_ACPI)
++#if defined(CONFIG_ACPI) && defined(CONFIG_X86)
+ int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len);
+ bool nouveau_acpi_rom_supported(struct pci_dev *pdev);
+ #else