eepro100: intermediate merge fixup