diff --git a/[refs] b/[refs] index 2c819107feba..f625a4fe86bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 284d115ec9b70d7c38752d10ad393a198db07a4b +refs/heads/master: 1a7e612fa5ea0311232bd5418a40ec7280557789 diff --git a/trunk/include/asm-arm/arch-pxa/pxa27x-udc.h b/trunk/include/asm-arm/arch-pxa/pxa27x-udc.h index 9cf0b1f88112..2d4e9cd3a5e3 100644 --- a/trunk/include/asm-arm/arch-pxa/pxa27x-udc.h +++ b/trunk/include/asm-arm/arch-pxa/pxa27x-udc.h @@ -2,7 +2,7 @@ #define _ASM_ARCH_PXA27X_UDC_H #ifdef _ASM_ARCH_PXA25X_UDC_H -#error You can't include both PXA25x and PXA27x UDC support +#error You cannot include both PXA25x and PXA27x UDC support #endif #define UDCCR __REG(0x40600000) /* UDC Control Register */