Merge linux-2.6 into linux-acpi-2.6 test
Len Brown [Sat, 3 Sep 2005 06:44:09 +0000 (02:44 -0400)]
1  2 
arch/ia64/Kconfig
arch/ia64/sn/kernel/irq.c
arch/ia64/sn/kernel/sn2/sn_proc_fs.c
drivers/serial/Kconfig

@@@ -357,6 -381,14 +357,12 @@@ source "kernel/power/Kconfig
  
  source "drivers/acpi/Kconfig"
  
 -endif
 -
+ if PM
+ source "arch/ia64/kernel/cpufreq/Kconfig"
+ endif
  endmenu
  
  if !IA64_HP_SIM
Simple merge
Simple merge
Simple merge