Definition is split here without obvious reason. Just merge it (and align order to that from C7 v4). Tested-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>