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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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)

Linus Torvalds 9 years ago 74e3f63c c2eca00f

+1 -1

1 changed file

expand all

drivers

ide

palm_bk3710.c

+1 -1

drivers/ide/palm_bk3710.c

··· 300 300 .cable_detect = palm_bk3710_cable_detect, 301 301 }; 302 302 303 - static struct ide_port_info palm_bk3710_port_info = { 303 + static struct ide_port_info palm_bk3710_port_info __initdata = { 304 304 .init_dma = palm_bk3710_init_dma, 305 305 .port_ops = &palm_bk3710_ports_ops, 306 306 .dma_ops = &sff_dma_ops,