diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-30 21:18:02 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-30 21:18:02 +0400 |
commit | f8356ed00ebcdc2f209504c02b4ab8ba9a8a7ebe (patch) | |
tree | 9191d024e747919eb05b83662b7f40f77d76dbe7 | |
parent | 7536d7be7b718f8c5834cbcb7601816562e1b805 (diff) | |
parent | a9b841e1a336822a25899ec8cdf70a55a6696ae7 (diff) | |
download | linux-f8356ed00ebcdc2f209504c02b4ab8ba9a8a7ebe.tar.xz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI: fix rpadlpar pci hotplug driver sysfs usage
-rw-r--r-- | drivers/pci/hotplug/rpadlpar_sysfs.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/rpadlpar_sysfs.c b/drivers/pci/hotplug/rpadlpar_sysfs.c index e32148a8fa12..779c5db71be4 100644 --- a/drivers/pci/hotplug/rpadlpar_sysfs.c +++ b/drivers/pci/hotplug/rpadlpar_sysfs.c @@ -18,8 +18,12 @@ #include "rpadlpar.h" #define DLPAR_KOBJ_NAME "control" -#define ADD_SLOT_ATTR_NAME "add_slot" -#define REMOVE_SLOT_ATTR_NAME "remove_slot" + +/* Those two have no quotes because they are passed to __ATTR() which + * stringifies the argument (yuck !) + */ +#define ADD_SLOT_ATTR_NAME add_slot +#define REMOVE_SLOT_ATTR_NAME remove_slot #define MAX_DRC_NAME_LEN 64 |