Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6b53703 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

sections: fix section conflicts in drivers/ide 



Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1849f23d

drivers/ide/aec62xx.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_port_ops = { 
	.cable_detect		= atp86x_cable_detect,

};



static const struct ide_port_info aec62xx_chipsets[] __devinitdata = {

static const struct ide_port_info aec62xx_chipsets[] __devinitconst = {

	{	/* 0: AEC6210 */

		.name		= DRV_NAME,

		.init_chipset	= init_chipset_aec62xx,

drivers/ide/ali14xx.c

+2 −2
Original line number Diff line number Diff line
@@ -52,13 +52,13 @@ 


/* port addresses for auto-detection */

#define ALI_NUM_PORTS 4

static const int ports[ALI_NUM_PORTS] __initdata =

static const int ports[ALI_NUM_PORTS] __initconst =

	{ 0x074, 0x0f4, 0x034, 0x0e4 };



/* register initialization data */

typedef struct { u8 reg, data; } RegInitializer;



static const RegInitializer initData[] __initdata = {

static const RegInitializer initData[] __initconst = {

	{0x01, 0x0f}, {0x02, 0x00}, {0x03, 0x00}, {0x04, 0x00},

	{0x05, 0x00}, {0x06, 0x00}, {0x07, 0x2b}, {0x0a, 0x0f},

	{0x25, 0x00}, {0x26, 0x00}, {0x27, 0x00}, {0x28, 0x00},

drivers/ide/alim15x3.c

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ static const struct ide_dma_ops ali_dma_ops = { 
	.dma_sff_read_status	= ide_dma_sff_read_status,

};



static const struct ide_port_info ali15x3_chipset __devinitdata = {

static const struct ide_port_info ali15x3_chipset __devinitconst = {

	.name		= DRV_NAME,

	.init_chipset	= init_chipset_ali15x3,

	.init_hwif	= init_hwif_ali15x3,

drivers/ide/amd74xx.c

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static const struct ide_port_ops amd_port_ops = { 
		.udma_mask	= udma,					\

	}



static const struct ide_port_info amd74xx_chipsets[] __devinitdata = {

static const struct ide_port_info amd74xx_chipsets[] __devinitconst = {

	/* 0: AMD7401 */	DECLARE_AMD_DEV(0x00, ATA_UDMA2),

	/* 1: AMD7409 */	DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4),

	/* 2: AMD7411/7441 */	DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),

drivers/ide/atiixp.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_port_ops = { 
	.cable_detect		= atiixp_cable_detect,

};



static const struct ide_port_info atiixp_pci_info[] __devinitdata = {

static const struct ide_port_info atiixp_pci_info[] __devinitconst = {

	{	/* 0: IXP200/300/400/700 */

		.name		= DRV_NAME,

		.enablebits	= {{0x48,0x01,0x00}, {0x48,0x08,0x00}},