From: Adrian Bunk Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton --- 25-akpm/drivers/scsi/aic7xxx/aic79xx_osm.c | 12 ------------ 25-akpm/drivers/scsi/aic7xxx/aic7xxx_osm.c | 12 ------------ 2 files changed, 24 deletions(-) diff -puN drivers/scsi/aic7xxx/aic79xx_osm.c~scsi-aic7xxx-remove-two-useless-variables drivers/scsi/aic7xxx/aic79xx_osm.c --- 25/drivers/scsi/aic7xxx/aic79xx_osm.c~scsi-aic7xxx-remove-two-useless-variables Thu Dec 16 14:27:03 2004 +++ 25-akpm/drivers/scsi/aic7xxx/aic79xx_osm.c Thu Dec 16 14:27:03 2004 @@ -407,12 +407,6 @@ uint32_t aic79xx_periodic_otag; * Module information and settable options. */ static char *aic79xx = NULL; -/* - * Just in case someone uses commas to separate items on the insmod - * command line, we define a dummy buffer here to avoid having insmod - * write wild stuff into our code segment - */ -static char dummy_buffer[60] = "Please don't trounce on me insmod!!\n"; MODULE_AUTHOR("Maintainer: Justin T. Gibbs "); MODULE_DESCRIPTION("Adaptec Aic790X U320 SCSI Host Bus Adapter driver"); @@ -861,12 +855,6 @@ ahd_linux_detect(Scsi_Host_Template *tem */ if (aic79xx) aic79xx_setup(aic79xx); - if (dummy_buffer[0] != 'P') - printk(KERN_WARNING -"aic79xx: Please read the file /usr/src/linux/drivers/scsi/README.aic79xx\n" -"aic79xx: to see the proper way to specify options to the aic79xx module\n" -"aic79xx: Specifically, don't use any commas when passing arguments to\n" -"aic79xx: insmod or else it might trash certain memory areas.\n"); #endif template->proc_name = "aic79xx"; diff -puN drivers/scsi/aic7xxx/aic7xxx_osm.c~scsi-aic7xxx-remove-two-useless-variables drivers/scsi/aic7xxx/aic7xxx_osm.c --- 25/drivers/scsi/aic7xxx/aic7xxx_osm.c~scsi-aic7xxx-remove-two-useless-variables Thu Dec 16 14:27:03 2004 +++ 25-akpm/drivers/scsi/aic7xxx/aic7xxx_osm.c Thu Dec 16 14:27:03 2004 @@ -427,12 +427,6 @@ uint32_t aic7xxx_periodic_otag; * Module information and settable options. */ static char *aic7xxx = NULL; -/* - * Just in case someone uses commas to separate items on the insmod - * command line, we define a dummy buffer here to avoid having insmod - * write wild stuff into our code segment - */ -static char dummy_buffer[60] = "Please don't trounce on me insmod!!\n"; MODULE_AUTHOR("Maintainer: Justin T. Gibbs "); MODULE_DESCRIPTION("Adaptec Aic77XX/78XX SCSI Host Bus Adapter driver"); @@ -850,12 +844,6 @@ ahc_linux_detect(Scsi_Host_Template *tem */ if (aic7xxx) aic7xxx_setup(aic7xxx); - if (dummy_buffer[0] != 'P') - printk(KERN_WARNING -"aic7xxx: Please read the file /usr/src/linux/drivers/scsi/README.aic7xxx\n" -"aic7xxx: to see the proper way to specify options to the aic7xxx module\n" -"aic7xxx: Specifically, don't use any commas when passing arguments to\n" -"aic7xxx: insmod or else it might trash certain memory areas.\n"); template->proc_name = "aic7xxx"; _