Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[cascardo/linux.git] / include / asm-arm / arch-s3c2410 / regs-udc.h

diff --git a/include/asm-arm/arch-s3c2410/regs-udc.h b/include/asm-arm/arch-s3c2410/regs-udc.h
index 3c83546..e1e9805 100644 (file)
--- a/include/asm-arm/arch-s3c2410/regs-udc.h
+++ b/include/asm-arm/arch-s3c2410/regs-udc.h
@@ -75,7 +75,7 @@
 #define S3C2410_UDC_OUT_FIFO_CNT1_REG  S3C2410_USBDREG(0x0198)
 #define S3C2410_UDC_OUT_FIFO_CNT2_REG  S3C2410_USBDREG(0x019c)
 
-
+#define S3C2410_UDC_FUNCADDR_UPDATE    (1<<7)
 
 #define S3C2410_UDC_PWR_ISOUP          (1<<7) // R/W
 #define S3C2410_UDC_PWR_RESET          (1<<3) // R
@@ -135,10 +135,6 @@
 #define S3C2410_UDC_OCSR2_ISO          (1<<6) // R/W
 #define S3C2410_UDC_OCSR2_DMAIEN       (1<<5) // R/W
 
-#define S3C2410_UDC_SETIX(base,x)          \
-       writel(S3C2410_UDC_INDEX_ ## x, base+S3C2410_UDC_INDEX_REG);
-
-
 #define S3C2410_UDC_EP0_CSR_OPKRDY     (1<<0)
 #define S3C2410_UDC_EP0_CSR_IPKRDY     (1<<1)
 #define S3C2410_UDC_EP0_CSR_SENTSTL    (1<<2)