Merge branch 'for-2.6.23' into merge

[linux-2.6] / include / asm-arm / arch-s3c2410 / udc.h

diff --git a/include/asm-arm/arch-s3c2410/udc.h b/include/asm-arm/arch-s3c2410/udc.h
index 2529effb8078576e641a955e97fbfa6070d2b901..b8aa6cb69b58ec5c8a7269ea9e2a54398db00d9d 100644 (file)
--- a/include/asm-arm/arch-s3c2410/udc.h
+++ b/include/asm-arm/arch-s3c2410/udc.h
@@ -1,4 +1,4 @@
-/* linux/include/asm/arch-s3c2410/udc.h
+/* linux/include/asm-arm/arch-s3c2410/udc.h
  *
  * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org>
  *
@@ -12,6 +12,7 @@
  *     14-Mar-2005     RTP     Created file
  *     02-Aug-2005     RTP     File rename
  *     07-Sep-2005     BJD     Minor cleanups, changed cmd to enum
+ *     18-Jan-2007     HMW     Add per-platform vbus_draw function
 */
 
 #ifndef __ASM_ARM_ARCH_UDC_H
@@ -25,6 +26,7 @@ enum s3c2410_udc_cmd_e {
 
 struct s3c2410_udc_mach_info {
        void    (*udc_command)(enum s3c2410_udc_cmd_e);
+       void    (*vbus_draw)(unsigned int ma);
        unsigned int vbus_pin;
        unsigned char vbus_pin_inverted;
 };