gpio: repairs incorrect merge comflict resolution

A merge conflict resolution in aafea43a1528d028c66849e8266c04675aa6690d
reverted a change added in f8e6479d13bce233ff4f9ef58a522a4225ff651d

Signed-off-by: Paul Butler <paul.butler@windriver.com>