diff options
| author |   James Morris <jmorris@namei.org> | 2008-08-28 10:47:34 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-08-28 10:47:34 +1000 |
| commit | 86d688984deefa3ae5a802880c11f2b408b5d6cf (patch) | |
| tree | 7ea5e8189b0a774626d3ed7c3c87df2495a4c4a0 /arch/arm/mach-pxa/eseries_udc.c | |
| parent | selinux: add support for installing a dummy policy (v2) (diff) | |
| parent | IB/mlx4: Actually return L_Key and R_Key for fast register MRs (diff) | |
| download | linux-dev-86d688984deefa3ae5a802880c11f2b408b5d6cf.tar.xz linux-dev-86d688984deefa3ae5a802880c11f2b408b5d6cf.zip | |
Merge branch 'master' into next
Diffstat (limited to 'arch/arm/mach-pxa/eseries_udc.c')
| -rw-r--r-- | arch/arm/mach-pxa/eseries_udc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/eseries_udc.c b/arch/arm/mach-pxa/eseries_udc.c index 362847a10998..d622c04c0d44 100644 --- a/arch/arm/mach-pxa/eseries_udc.c +++ b/arch/arm/mach-pxa/eseries_udc.c @@ -14,10 +14,10 @@ #include <linux/init.h> #include <linux/device.h> -#include <asm/arch/udc.h> -#include <asm/arch/eseries-gpio.h> -#include <asm/arch/hardware.h> -#include <asm/arch/pxa-regs.h> +#include <mach/udc.h> +#include <mach/eseries-gpio.h> +#include <mach/hardware.h> +#include <mach/pxa-regs.h> #include <asm/mach/arch.h> #include <asm/mach-types.h> #include <asm/mach/map.h> |