Controller channel device order swapped over in 2.6.9-1.3_FC2