Joined the two files as they contain distinct definitions.
Inspired by patch from: Adrian Bunk

Signed-off-by: Sam Ravnborg
Cc: Adrian Bunk