From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/scsi/Kconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff -puN drivers/scsi/Kconfig~git-jg-misc-git-rejects drivers/scsi/Kconfig --- a/drivers/scsi/Kconfig~git-jg-misc-git-rejects +++ a/drivers/scsi/Kconfig @@ -504,8 +504,6 @@ config SCSI_AIC7XXX_OLD source "drivers/scsi/aic7xxx/Kconfig.aic79xx" source "drivers/scsi/aic94xx/Kconfig" -<<<<<<< HEAD:drivers/scsi/Kconfig -======= config SCSI_BROADSAS tristate "Broadcom 8603 SAS/SATA support" depends on PCI @@ -517,7 +515,7 @@ config SCSI_BROADSAS module will be called broadsas. # All the I2O code and drivers do not seem to be 64bit safe. ->>>>>>> FETCH_HEAD:drivers/scsi/Kconfig + config SCSI_DPT_I2O tristate "Adaptec I2O RAID support " depends on SCSI && PCI && VIRT_TO_BUS _