Merge branch 'processor-procfs-2.6.32' into release
Len Brown [Sat, 19 Sep 2009 06:10:40 +0000 (02:10 -0400)]
1  2 
drivers/acpi/Kconfig
drivers/acpi/processor_core.c
drivers/acpi/processor_idle.c
drivers/acpi/processor_thermal.c
drivers/acpi/processor_throttling.c

Simple merge
@@@ -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);
Simple merge
Simple merge
Simple merge