Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 (f8356ed0) · Commits · e / devices / android_kernel_teracube_2e

drivers/pci/hotplug/rpadlpar_sysfs.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -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