Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

[pandora-kernel.git] / include / linux / usb / sl811.h

diff --git a/include/linux/usb/sl811.h b/include/linux/usb/sl811.h
index 397ee3b..3afe4d1 100644 (file)
--- a/include/linux/usb/sl811.h
+++ b/include/linux/usb/sl811.h
@@ -1,9 +1,11 @@
-
 /*
  * board initialization should put one of these into dev->platform_data
  * and place the sl811hs onto platform_bus named "sl811-hcd".
  */
 
+#ifndef __LINUX_USB_SL811_H
+#define __LINUX_USB_SL811_H
+
 struct sl811_platform_data {
        unsigned        can_wakeup:1;
 
@@ -19,8 +21,9 @@ struct sl811_platform_data {
        /* pulse sl811 nRST (probably with a GPIO) */
        void            (*reset)(struct device *dev);
 
-       // some boards need something like these:
-       // int          (*check_overcurrent)(struct device *dev);
-       // void         (*clock_enable)(struct device *dev, int is_on);
+       /* some boards need something like these: */
+       /* int          (*check_overcurrent)(struct device *dev); */
+       /* void         (*clock_enable)(struct device *dev, int is_on); */
 };
 
+#endif /* __LINUX_USB_SL811_H */