From: Len Brown <len.brown@intel.com>
Date: Sat, 19 Sep 2009 06:10:40 +0000 (-0400)
Subject: Merge branch 'processor-procfs-2.6.32' into release
X-Git-Tag: v2.6.32-rc1~171^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cbeee13570adfb0af494a07074958e4888c2351c;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'processor-procfs-2.6.32' into release
---

cbeee13570adfb0af494a07074958e4888c2351c
diff --cc drivers/acpi/processor_core.c
index b972107a1ef2f,1b166c1be1670..c2d4d6e093646
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@@ -81,8 -79,11 +81,10 @@@ MODULE_DESCRIPTION("ACPI Processor Driv
  MODULE_LICENSE("GPL");
  
  static int acpi_processor_add(struct acpi_device *device);
 -static int acpi_processor_start(struct acpi_device *device);
  static int acpi_processor_remove(struct acpi_device *device, int type);
+ #ifdef CONFIG_ACPI_PROCFS
  static int acpi_processor_info_open_fs(struct inode *inode, struct file *file);
+ #endif
  static void acpi_processor_notify(struct acpi_device *device, u32 event);
  static acpi_status acpi_processor_hotadd_init(acpi_handle handle, int *p_cpu);
  static int acpi_processor_handle_eject(struct acpi_processor *pr);