tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ide: remove CONFIG_BLK_DEV_IDEDOUBLER config option

Nowadays it is not worth having a separate config option for
Amiga IDE Doubler support so always include it (it still needs
to be explicitly enabled by module parameter).

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Bartlomiej Zolnierkiewicz 9f5af4d6 41fa9f86

+10 -27
+9 -16
drivers/ide/Kconfig
··· 770 770 This includes on-board IDE interfaces on some Amiga models (A600, 771 771 A1200, A4000, and A4000T), and IDE interfaces on the Zorro expansion 772 772 bus (M-Tech E-Matrix 530 expansion card). 773 - Say Y if you have an Amiga with a Gayle IDE interface and want to use 774 - IDE devices (hard disks, CD-ROM drives, etc.) that are connected to 775 - it. 776 - Note that you also have to enable Zorro bus support if you want to 777 - use Gayle IDE interfaces on the Zorro expansion bus. 778 773 779 - config BLK_DEV_IDEDOUBLER 780 - bool "Amiga IDE Doubler support (EXPERIMENTAL)" 781 - depends on BLK_DEV_GAYLE && EXPERIMENTAL 782 - ---help--- 783 - This feature provides support for the so-called `IDE doublers' (made 774 + It also provides support for the so-called `IDE doublers' (made 784 775 by various manufacturers, e.g. Eyetech) that can be connected to 785 776 the on-board IDE interface of some Amiga models. Using such an IDE 786 777 doubler, you can connect up to four instead of two IDE devices to 787 - the Amiga's on-board IDE interface. 788 - 789 - Note that the normal Amiga Gayle IDE driver may not work correctly 790 - if you have an IDE doubler and don't enable this feature! 791 - 792 - Say Y if you have an IDE doubler. The feature is enabled at kernel 778 + the Amiga's on-board IDE interface. The feature is enabled at kernel 793 779 runtime using the "gayle.doubler" kernel boot parameter. 780 + 781 + Say Y if you have an Amiga with a Gayle IDE interface and want to use 782 + IDE devices (hard disks, CD-ROM drives, etc.) that are connected to 783 + it. 784 + 785 + Note that you also have to enable Zorro bus support if you want to 786 + use Gayle IDE interfaces on the Zorro expansion bus. 794 787 795 788 config BLK_DEV_BUDDHA 796 789 tristate "Buddha/Catweasel/X-Surf IDE interface support (EXPERIMENTAL)"
+1 -11
drivers/ide/gayle.c
··· 53 53 54 54 #define GAYLE_NEXT_PORT 0x1000 55 55 56 - #ifndef CONFIG_BLK_DEV_IDEDOUBLER 57 - #define GAYLE_NUM_HWIFS 1 58 - #define GAYLE_NUM_PROBE_HWIFS GAYLE_NUM_HWIFS 59 - #define GAYLE_HAS_CONTROL_REG 1 60 - #else /* CONFIG_BLK_DEV_IDEDOUBLER */ 61 56 #define GAYLE_NUM_HWIFS 2 62 57 #define GAYLE_NUM_PROBE_HWIFS (ide_doubler ? GAYLE_NUM_HWIFS : \ 63 58 GAYLE_NUM_HWIFS-1) ··· 61 66 static int ide_doubler; 62 67 module_param_named(doubler, ide_doubler, bool, 0); 63 68 MODULE_PARM_DESC(doubler, "enable support for IDE doublers"); 64 - #endif /* CONFIG_BLK_DEV_IDEDOUBLER */ 65 - 66 69 67 70 /* 68 71 * Check and acknowledge the interrupt status ··· 144 151 found: 145 152 printk(KERN_INFO "ide: Gayle IDE controller (A%d style%s)\n", 146 153 a4000 ? 4000 : 1200, 147 - #ifdef CONFIG_BLK_DEV_IDEDOUBLER 148 - ide_doubler ? ", IDE doubler" : 149 - #endif 150 - ""); 154 + ide_doubler ? ", IDE doubler" : ""); 151 155 152 156 if (a4000) { 153 157 phys_base = GAYLE_BASE_4000;