tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds f8356ed0 7536d7be

+6 -2
unified split
+6 -2
drivers/pci/hotplug/rpadlpar_sysfs.c
··· 18 #include "rpadlpar.h" 19 20 #define DLPAR_KOBJ_NAME "control" 21 - #define ADD_SLOT_ATTR_NAME "add_slot" 22 - #define REMOVE_SLOT_ATTR_NAME "remove_slot" 23 24 #define MAX_DRC_NAME_LEN 64 25
··· 18 #include "rpadlpar.h" 19 20 #define DLPAR_KOBJ_NAME "control" 21 + 22 + /* Those two have no quotes because they are passed to __ATTR() which 23 + * stringifies the argument (yuck !) 24 + */ 25 + #define ADD_SLOT_ATTR_NAME add_slot 26 + #define REMOVE_SLOT_ATTR_NAME remove_slot 27 28 #define MAX_DRC_NAME_LEN 64 29