310c310
< CONFIG_SCSI_QLA2XXX_CONFIG=y
---
> CONFIG_SCSI_QLA2XXX=y
313c313,316
< # CONFIG_SCSI_QLA23XX is not set
---
> # CONFIG_SCSI_QLA2300 is not set
> # CONFIG_SCSI_QLA2322 is not set
> # CONFIG_SCSI_QLA6312 is not set
> # CONFIG_SCSI_QLA6322 is not set
404a408
> # CONFIG_TULIP_NAPI is not set
652a657
> # CONFIG_XFS_SECURITY is not set
839a845
> # CONFIG_SND_BT87X is not set
939d944
< # CONFIG_USB_SCANNER is not set