[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Nelson Castillo]

The following commit has been merged in the andy-tracking branch:
commit 901d73fe51f33032b34b2ae5612eb863ec90532a
Author: Michael Trimarchi <trimarchi at gandalf.sssup.it>
Date:   Wed Apr 8 15:50:02 2009 +0200

    Re-enable USBHOST attribute
    
    Re-enable usbmode attribute.
    It was disabled by 70b36104ab8c03f5be6d03344214d09447d9d4a8.
    
    Signed-off-by: Michael Trimarchi <michael at panicking.kicks-ass.org>

diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
index 4c69ee5..cdbd3f2 100644
--- a/drivers/usb/host/ohci-s3c2410.c
+++ b/drivers/usb/host/ohci-s3c2410.c
@@ -21,10 +21,8 @@
 
 #include <linux/platform_device.h>
 #include <linux/clk.h>
-/*
 #include <mach/hardware.h>
 #include <mach/regs-gpio.h>
-*/
 #include <plat/usb-control.h>
 
 #define valid_port(idx) ((idx) == 1 || (idx) == 2)
@@ -307,7 +305,6 @@ static void s3c2410_hcd_oc(struct s3c2410_hcd_info *info, int port_oc)
 	local_irq_restore(flags);
 }
 
-#if 0
 /* switching of USB pads */
 static ssize_t show_usb_mode(struct device *dev, struct device_attribute *attr,
 			     char *buf)
@@ -343,7 +340,6 @@ static ssize_t set_usb_mode(struct device *dev, struct device_attribute *attr,
 }
 
 static DEVICE_ATTR(usb_mode, S_IRUGO | S_IWUSR, show_usb_mode, set_usb_mode);
-#endif
 
 /* may be called without controller electrically present */
 /* may be called with controller, bus, and devices active */
@@ -362,9 +358,7 @@ static DEVICE_ATTR(usb_mode, S_IRUGO | S_IWUSR, show_usb_mode, set_usb_mode);
 static void
 usb_hcd_s3c2410_remove(struct usb_hcd *hcd, struct platform_device *dev)
 {
-/*
 	device_remove_file(&dev->dev, &dev_attr_usb_mode);
-*/
 	usb_remove_hcd(hcd);
 	s3c2410_stop_hc(dev);
 	iounmap(hcd->regs);
@@ -432,18 +426,14 @@ static int usb_hcd_s3c2410_probe(const struct hc_driver *driver,
 	if (retval != 0)
 		goto err_ioremap;
 
-/*
 	retval = device_create_file(&dev->dev, &dev_attr_usb_mode);
 	if (retval != 0)
 		goto err_hcd;
-*/
 
 	return 0;
 
-/*
 err_hcd:
 	usb_remove_hcd(hcd);
-*/
 
 err_ioremap:
 	s3c2410_stop_hc(dev);

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko