Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Manual merge of kernel/params.c clashes.

diff --cc arch/i386/Kconfig
Simple merge

diff --cc drivers/ide/pci/hpt366.c
Simple merge

diff --cc include/linux/moduleparam.h
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge

diff --cc kernel/params.c
index df5407c821adb8fe827f1110c8fbd3baa5e6286e,711a76e6bc2fcf7df05686bd9026842b30fc5548..cfd8a8413bf6fefd64d702dc75d1e80e1bef1107
--- 1/kernel/params.c
--- 2/kernel/params.c
+++ b/kernel/params.c
@@@ -340,8 -339,12 +340,14 @@@ int param_set_copystring(const char *va
        return 0;
  }
  
+ int param_get_string(char *buffer, struct kernel_param *kp)
+ {
+       struct kparam_string *kps = kp->arg;
+       return strlcpy(buffer, kps->string, kps->maxlen);
+ }
+ 
 +EXPORT_SYMBOL(param_set_byte);
 +EXPORT_SYMBOL(param_get_byte);
  EXPORT_SYMBOL(param_set_short);
  EXPORT_SYMBOL(param_get_short);
  EXPORT_SYMBOL(param_set_ushort);