Fix 'pxa' disco-mode problems