From 3e0cc569a53ae887f5876520ec8981e4eb6dfe09 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 6 Dec 2010 12:30:31 +1000 Subject: [PATCH] --- yaml --- r: 228824 b: refs/heads/master c: 6c2df40ec00e52a5fb0c691b0e79324b9015aaa4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/vga/vga_switcheroo.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 25ee78018f39..b6b9edebb87c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17db7042b7ff77a4ae8b83ab42ec8286a9715a48 +refs/heads/master: 6c2df40ec00e52a5fb0c691b0e79324b9015aaa4 diff --git a/trunk/drivers/gpu/vga/vga_switcheroo.c b/trunk/drivers/gpu/vga/vga_switcheroo.c index c8768f38511e..0a8678fe4d64 100644 --- a/trunk/drivers/gpu/vga/vga_switcheroo.c +++ b/trunk/drivers/gpu/vga/vga_switcheroo.c @@ -174,7 +174,8 @@ static int vga_switcheroo_show(struct seq_file *m, void *v) int i; mutex_lock(&vgasr_mutex); for (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) { - seq_printf(m, "%d:%c:%s:%s\n", i, + seq_printf(m, "%d:%s:%c:%s:%s\n", i, + vgasr_priv.clients[i].id == VGA_SWITCHEROO_DIS ? "DIS" : "IGD", vgasr_priv.clients[i].active ? '+' : ' ', vgasr_priv.clients[i].pwr_state ? "Pwr" : "Off", pci_name(vgasr_priv.clients[i].pdev));