Patch merged into coreboot/master: PCI ops: Remove conflicting duplicate declarations

the following patch was just integrated into master:
commit 8db31a8f4eb247df86c658acb4cb7c5f97456e68
Author: Kyösti Mälkki 
Date:   Mon Dec 5 06:33:32 2016 +0200

PCI ops: Remove conflicting duplicate declarations

The code originates from times before __SIMPLE_DEVICE__ was
    introduced. To keep behaviour unchanged, use explicit PCI
    IO operations here.

Change-Id: I44851633115f9aee4c308fd3711571a4b14c5f2f
    Signed-off-by: Kyösti Mälkki 
    Reviewed-on: https://review.coreboot.org/17720
    Tested-by: build bot (Jenkins)
    Reviewed-by: Aaron Durbin

See https://review.coreboot.org/17720 for details.

-gerrit