Mandrake patch question
Trying to install the ppscsi patch for my scanner.
Found a problem. I was not able to apply the patch successfully. How do I get the info below from the rejected files into the /usr/src/linux/drivers/scsi/Config.in & Makefile files? Is there a patch option that will do this or do I somehow manually copy & paste the info from the rejected files into the config files?
Rejected Files:
/usr/src/linux/drivers/scsi/Config.in.rej:
117,122 ****
bool ' ppa/imm option - Assume slow parport control register' CONFIG_SCSI_IZIP_SLOW_CTR
fi
fi
dep_tristate 'NCR53c406a SCSI support' CONFIG_SCSI_NCR53C406A $CONFIG_SCSI
if [ "$CONFIG_MCA" = "y" ]; then
dep_tristate 'NCR Dual 700 MCA SCSI support' CONFIG_SCSI_NCR_D700 $CONFIG_SCSI
--- 117,137 ----
bool ' ppa/imm option - Assume slow parport control register' CONFIG_SCSI_IZIP_SLOW_CTR
fi
fi
+
+ dep_tristate 'Parallel Port SCSI adapters' CONFIG_PPSCSI $CONFIG_SCSI $CONFIG_PARPORT
+ if [ "$CONFIG_PPSCSI" != "n" ]; then
+ dep_tristate ' Adaptec APA-348 adapter' CONFIG_PPSCSI_T348 $CONFIG_PPSCSI
+ dep_tristate ' Adaptec APA-358 adapter' CONFIG_PPSCSI_T358 $CONFIG_PPSCSI
+ dep_tristate ' Iomega VPI0 adapter' CONFIG_PPSCSI_VPI0 $CONFIG_PPSCSI
+ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+ dep_tristate ' Iomega VPI2 adapter (EXPERIMENTAL)' CONFIG_PPSCSI_VPI2 $CONFIG_PPSCSI
+ fi
+ dep_tristate ' OnSpec 90c26 adapter' CONFIG_PPSCSI_ONSCSI $CONFIG_PPSCSI
+ dep_tristate ' Shining SparSCI adapter' CONFIG_PPSCSI_SPARCSI $CONFIG_PPSCSI
+ dep_tristate ' Shuttle EPSA-2 adapter' CONFIG_PPSCSI_EPSA2 $CONFIG_PPSCSI
+ dep_tristate ' Shuttle EPST adapter' CONFIG_PPSCSI_EPST $CONFIG_PPSCSI
+ fi
+
dep_tristate 'NCR53c406a SCSI support' CONFIG_SCSI_NCR53C406A $CONFIG_SCSI
if [ "$CONFIG_MCA" = "y" ]; then
dep_tristate 'NCR Dual 700 MCA SCSI support' CONFIG_SCSI_NCR_D700 $CONFIG_SCSI
/usr/src/linux/drivers/scsi/Makefile.rej
* 135,140 ****
obj-$(CONFIG_BLK_DEV_SD) += sd_mod.o
obj-$(CONFIG_BLK_DEV_SR) += sr_mod.o
obj-$(CONFIG_CHR_DEV_SG) += sg.o
list-multi := scsi_mod.o sd_mod.o sr_mod.o initio.o a100u2w.o cpqfc.o
scsi_mod-objs := scsi.o hosts.o scsi_ioctl.o constants.o \
--- 135,149 ----
obj-$(CONFIG_BLK_DEV_SD) += sd_mod.o
obj-$(CONFIG_BLK_DEV_SR) += sr_mod.o
obj-$(CONFIG_CHR_DEV_SG) += sg.o
+ obj-$(CONFIG_PPSCSI) += ppscsi.o
+ obj-$(CONFIG_PPSCSI_T348) += t348.o
+ obj-$(CONFIG_PPSCSI_T358) += t358.o
+ obj-$(CONFIG_PPSCSI_ONSCSI) += onscsi.o
+ obj-$(CONFIG_PPSCSI_EPSA2) += epsa2.o
+ obj-$(CONFIG_PPSCSI_EPST) += epst.o
+ obj-$(CONFIG_PPSCSI_VPI0) += vpi0.o
+ obj-$(CONFIG_PPSCSI_VPI2) += vpi2.o
+ obj-$(CONFIG_PPSCSI_SPARCSI) += sparcsi.o
list-multi := scsi_mod.o sd_mod.o sr_mod.o initio.o a100u2w.o cpqfc.o
scsi_mod-objs := scsi.o hosts.o scsi_ioctl.o constants.o \
Anyone ?? Thank's.
|