Patch from Deepak Saxena

Removes extraneous bits that belong to separate IOP3xx PCI cleanup patch
Supersedes 1618/1