Commit 74e3f63c authored Feb 28, 2017 by Linus Torvalds

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

Pull IDE updates from David Miller:
 "Just one actual change here this time around, adding some init data
  annotations. The other change was bogus and got reverted"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: palm_bk3710: add __initdata to palm_bk3710_port_info
  Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)"
  ide: Fix interface autodetection in legacy IDE driver (trial #2)

parents c2eca00f 96297aee

drivers/ide/palm_bk3710.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -300,7 +300,7 @@ static const struct ide_port_ops palm_bk3710_ports_ops = {
		.cable_detect = palm_bk3710_cable_detect,
		};

		static struct ide_port_info palm_bk3710_port_info = {
		static struct ide_port_info palm_bk3710_port_info __initdata = {
		.init_dma = palm_bk3710_init_dma,
		.port_ops = &palm_bk3710_ports_ops,
		.dma_ops = &sff_dma_ops,