Bring mach-bcm947xx/gpio.h into line with new SSB code, as per #1640