| From 19d000d93303e05bd7b1326e3de9df05a41b25b5 Mon Sep 17 00:00:00 2001 |
| From: Randy Dunlap <rdunlap@infradead.org> |
| Date: Fri, 16 Apr 2021 15:46:06 -0700 |
| Subject: ia64: remove duplicate entries in generic_defconfig |
| |
| From: Randy Dunlap <rdunlap@infradead.org> |
| |
| commit 19d000d93303e05bd7b1326e3de9df05a41b25b5 upstream. |
| |
| Fix ia64 generic_defconfig duplicate entries, as warned by: |
| |
| arch/ia64/configs/generic_defconfig: warning: override: reassigning to symbol ATA: => 58 |
| arch/ia64/configs/generic_defconfig: warning: override: reassigning to symbol ATA_PIIX: => 59 |
| |
| These 2 symbols still have the same value as in the removed lines. |
| |
| Link: https://lkml.kernel.org/r/20210411020255.18052-1-rdunlap@infradead.org |
| Fixes: c331649e6371 ("ia64: Use libata instead of the legacy ide driver in defconfigs") |
| Signed-off-by: Randy Dunlap <rdunlap@infradead.org> |
| Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> |
| Reviewed-by: Christoph Hellwig <hch@lst.de> |
| Cc: Tony Luck <tony.luck@intel.com> |
| Cc: Fenghua Yu <fenghua.yu@intel.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/ia64/configs/generic_defconfig | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| --- a/arch/ia64/configs/generic_defconfig |
| +++ b/arch/ia64/configs/generic_defconfig |
| @@ -55,8 +55,6 @@ CONFIG_CHR_DEV_SG=m |
| CONFIG_SCSI_FC_ATTRS=y |
| CONFIG_SCSI_SYM53C8XX_2=y |
| CONFIG_SCSI_QLOGIC_1280=y |
| -CONFIG_ATA=y |
| -CONFIG_ATA_PIIX=y |
| CONFIG_SATA_VITESSE=y |
| CONFIG_MD=y |
| CONFIG_BLK_DEV_MD=m |
