diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-01-24 06:47:48 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-01-24 06:47:48 -0500 |
commit | befddb21c845f8fb49e637997891ef97c6a869dc (patch) | |
tree | 0e7629123184f2dd50291ad6d477b894175f0f26 /drivers/usb/chipidea/debug.c | |
parent | e716efde75267eab919cdb2bef5b2cb77f305326 (diff) | |
parent | 7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619 (diff) |
Merge tag 'v3.8-rc4' into irq/core
Merge Linux 3.8-rc4 before pulling in new commits - we were on an old v3.7 base.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/usb/chipidea/debug.c')
-rw-r--r-- | drivers/usb/chipidea/debug.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/usb/chipidea/debug.c b/drivers/usb/chipidea/debug.c index c6f50a257565..3bc244d2636a 100644 --- a/drivers/usb/chipidea/debug.c +++ b/drivers/usb/chipidea/debug.c | |||
@@ -160,9 +160,6 @@ static ssize_t show_device(struct device *dev, struct device_attribute *attr, | |||
160 | gadget->speed); | 160 | gadget->speed); |
161 | n += scnprintf(buf + n, PAGE_SIZE - n, "max_speed = %d\n", | 161 | n += scnprintf(buf + n, PAGE_SIZE - n, "max_speed = %d\n", |
162 | gadget->max_speed); | 162 | gadget->max_speed); |
163 | /* TODO: Scheduled for removal in 3.8. */ | ||
164 | n += scnprintf(buf + n, PAGE_SIZE - n, "is_dualspeed = %d\n", | ||
165 | gadget_is_dualspeed(gadget)); | ||
166 | n += scnprintf(buf + n, PAGE_SIZE - n, "is_otg = %d\n", | 163 | n += scnprintf(buf + n, PAGE_SIZE - n, "is_otg = %d\n", |
167 | gadget->is_otg); | 164 | gadget->is_otg); |
168 | n += scnprintf(buf + n, PAGE_SIZE - n, "is_a_peripheral = %d\n", | 165 | n += scnprintf(buf + n, PAGE_SIZE - n, "is_a_peripheral = %d\n", |