[PATCH] fix up SCSI netlink build

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The configuration change I introduced was overly optimistic.  We need to
account for the fact that CONFIG_SCSI_NETLINK can be a module.

James

Index: BUILD-2.6/drivers/scsi/Makefile
===================================================================
--- BUILD-2.6.orig/drivers/scsi/Makefile	2006-09-07 10:42:51.000000000 -0500
+++ BUILD-2.6/drivers/scsi/Makefile	2006-09-07 10:47:20.000000000 -0500
@@ -144,7 +144,8 @@ scsi_mod-y			+= scsi.o hosts.o scsi_ioct
 				   scsicam.o scsi_error.o scsi_lib.o \
 				   scsi_scan.o scsi_sysfs.o \
 				   scsi_devinfo.o
-scsi_mod-$(CONFIG_SCSI_NETLINK)	+= scsi_netlink.o
+scsi_nl-$(CONFIG_SCSI_NETLINK)	+= scsi_netlink.o
+scsi_mod-y			+= $(scsi_nl-m) $(scsi_nl-y)
 scsi_mod-$(CONFIG_SYSCTL)	+= scsi_sysctl.o
 scsi_mod-$(CONFIG_SCSI_PROC_FS)	+= scsi_proc.o
 
Index: BUILD-2.6/drivers/scsi/scsi_priv.h
===================================================================
--- BUILD-2.6.orig/drivers/scsi/scsi_priv.h	2006-09-07 10:42:51.000000000 -0500
+++ BUILD-2.6/drivers/scsi/scsi_priv.h	2006-09-07 10:46:31.000000000 -0500
@@ -112,7 +112,7 @@ extern void __scsi_remove_device(struct 
 extern struct bus_type scsi_bus_type;
 
 /* scsi_netlink.c */
-#ifdef CONFIG_SCSI_NETLINK
+#if defined(CONFIG_SCSI_NETLINK) || defined(CONFIG_SCSI_NETLINK_MODULE)
 extern void scsi_netlink_init(void);
 extern void scsi_netlink_exit(void);
 extern struct sock *scsi_nl_sock;


-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [SCSI Target Devel]     [Linux SCSI Target Infrastructure]     [Kernel Newbies]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Linux IIO]     [Samba]     [Device Mapper]
  Powered by Linux