]>
Commit | Line | Data |
---|---|---|
4a99e868 | 1 | diff -uNr linux.orig/drivers/scsi/Config.in linux/drivers/scsi/Config.in |
2 | --- linux.orig/drivers/scsi/Config.in Wed Oct 17 10:00:29 2001 | |
3 | +++ linux/drivers/scsi/Config.in Wed Oct 17 10:25:40 2001 | |
4 | @@ -96,7 +96,8 @@ | |
5 | if [ "$CONFIG_PCI" = "y" -a "$CONFIG_SCSI_NCR53C7xx" != "y" ]; then | |
6 | dep_tristate 'NCR53C8XX SCSI support' CONFIG_SCSI_NCR53C8XX $CONFIG_SCSI | |
7 | dep_tristate 'SYM53C8XX SCSI support' CONFIG_SCSI_SYM53C8XX $CONFIG_SCSI | |
8 | - if [ "$CONFIG_SCSI_NCR53C8XX" != "n" -o "$CONFIG_SCSI_SYM53C8XX" != "n" ]; then | |
9 | + dep_tristate 'SYM53C8XX SCSI ver 2 support' CONFIG_SCSI_SYM53C8XX2 $CONFIG_SCSI | |
10 | + if [ "$CONFIG_SCSI_NCR53C8XX" != "n" -o "$CONFIG_SCSI_SYM53C8XX" != "n" -o "$CONFIG_SCSI_SYM53C8XX2" != "n"]; then | |
11 | int ' default tagged command queue depth' CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS 16 | |
12 | int ' maximum number of queued commands' CONFIG_SCSI_NCR53C8XX_MAX_TAGS 32 | |
13 | int ' synchronous transfers frequency in MHz' CONFIG_SCSI_NCR53C8XX_SYNC 80 | |
14 | diff -uNr linux.orig/drivers/scsi/Makefile linux/drivers/scsi/Makefile | |
15 | --- linux.orig/drivers/scsi/Makefile Wed Oct 17 10:00:29 2001 | |
16 | +++ linux/drivers/scsi/Makefile Wed Oct 17 10:08:54 2001 | |
17 | @@ -44,11 +44,11 @@ | |
18 | ||
19 | endif | |
20 | ||
21 | -ifeq ($(CONFIG_SCSI_SYM53C8XX),y) | |
22 | +ifeq ($(CONFIG_SCSI_SYM53C8XX2),y) | |
23 | SUB_DIRS += sym53c8xx | |
24 | - L_OBJS += sym53c8xx/sym53c8xx.o | |
25 | + L_OBJS += sym53c8xx/sym53c8xx2.o | |
26 | else | |
27 | - ifeq ($(CONFIG_SCSI_SYM53C8XX),m) | |
28 | + ifeq ($(CONFIG_SCSI_SYM53C8XX2),m) | |
29 | MOD_SUB_DIRS += sym53c8xx | |
30 | endif | |
31 | endif | |
32 | @@ -542,6 +542,14 @@ | |
33 | endif | |
34 | endif | |
35 | ||
36 | +ifeq ($(CONFIG_SCSI_SYM53C8XX),y) | |
37 | +L_OBJS += sym53c8xx.o | |
38 | +else | |
39 | + ifeq ($(CONFIG_SCSI_SYM53C8XX),m) | |
40 | + M_OBJS += sym53c8xx.o | |
41 | + endif | |
42 | +endif | |
43 | + | |
44 | ifeq ($(CONFIG_SCSI_PAS16),y) | |
45 | L_OBJS += pas16.o | |
46 | else | |
47 | diff -uNr linux.orig/drivers/scsi/sym53c8xx/Makefile linux/drivers/scsi/sym53c8xx/Makefile | |
48 | --- linux.orig/drivers/scsi/sym53c8xx/Makefile Wed Oct 17 10:00:29 2001 | |
49 | +++ linux/drivers/scsi/sym53c8xx/Makefile Wed Oct 17 10:09:46 2001 | |
50 | @@ -1,14 +1,14 @@ | |
51 | # File: drivers/sym53c8xx/Makefile | |
52 | # Makefile for the NCR/SYMBIOS/LSI 53C8XX PCI SCSI controllers driver. | |
53 | ||
54 | -ifeq ($(CONFIG_SCSI_SYM53C8XX),y) | |
55 | - O_TARGET := sym53c8xx.o | |
56 | +ifeq ($(CONFIG_SCSI_SYM53C8XX2),y) | |
57 | + O_TARGET := sym53c8xx2.o | |
58 | O_OBJS := sym_fw.o sym_glue.o sym_hipd.o sym_malloc.o sym_misc.o sym_nvram.o | |
59 | else | |
60 | - ifeq ($(CONFIG_SCSI_SYM53C8XX),m) | |
61 | + ifeq ($(CONFIG_SCSI_SYM53C8XX2),m) | |
62 | MOD_LIST_NAME := SCSI_MODULES | |
63 | - M_OBJS := sym53c8xx.o | |
64 | - O_TARGET := sym53c8xx.o | |
65 | + M_OBJS := sym53c8xx2.o | |
66 | + O_TARGET := sym53c8xx2.o | |
67 | O_OBJS := sym_fw.o sym_glue.o sym_hipd.o sym_malloc.o sym_misc.o sym_nvram.o | |
68 | endif | |
69 | endif |