diff options
author | Ben Dooks <ben@simtec.co.uk> | 2009-03-07 06:44:21 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-24 19:20:45 -0400 |
commit | 49121aa14c2a372a5fd01982df900257784be63d (patch) | |
tree | d2959b33b3bd6fb3b70f8451fcfeb7d606eea165 /arch/arm | |
parent | 3ba5f38f3d5143a879de132a9df71814d1f3cff0 (diff) |
USB: S3C: Move usb-control.h to platform include
The usb-control.h is needed by ohci-s3c2410.c for both S3C24XX and S3C64XX
architectures, so move it to <plat/usb-control.h>
Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-s3c2410/usb-simtec.c | 3 | ||||
-rw-r--r-- | arch/arm/plat-s3c/include/plat/usb-control.h (renamed from arch/arm/mach-s3c2410/include/mach/usb-control.h) | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2410/usb-simtec.c b/arch/arm/mach-s3c2410/usb-simtec.c index 6078f09b7df5..8331e8d97e20 100644 --- a/arch/arm/mach-s3c2410/usb-simtec.c +++ b/arch/arm/mach-s3c2410/usb-simtec.c | |||
@@ -29,13 +29,14 @@ | |||
29 | 29 | ||
30 | #include <mach/bast-map.h> | 30 | #include <mach/bast-map.h> |
31 | #include <mach/bast-irq.h> | 31 | #include <mach/bast-irq.h> |
32 | #include <mach/usb-control.h> | ||
33 | #include <mach/regs-gpio.h> | 32 | #include <mach/regs-gpio.h> |
34 | 33 | ||
35 | #include <mach/hardware.h> | 34 | #include <mach/hardware.h> |
36 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
37 | 36 | ||
37 | #include <plat/usb-control.h> | ||
38 | #include <plat/devs.h> | 38 | #include <plat/devs.h> |
39 | |||
39 | #include "usb-simtec.h" | 40 | #include "usb-simtec.h" |
40 | 41 | ||
41 | /* control power and monitor over-current events on various Simtec | 42 | /* control power and monitor over-current events on various Simtec |
diff --git a/arch/arm/mach-s3c2410/include/mach/usb-control.h b/arch/arm/plat-s3c/include/plat/usb-control.h index cd91d1591f31..822c87fe948e 100644 --- a/arch/arm/mach-s3c2410/include/mach/usb-control.h +++ b/arch/arm/plat-s3c/include/plat/usb-control.h | |||
@@ -1,9 +1,9 @@ | |||
1 | /* arch/arm/mach-s3c2410/include/mach/usb-control.h | 1 | /* arch/arm/plat-s3c/include/plat/usb-control.h |
2 | * | 2 | * |
3 | * Copyright (c) 2004 Simtec Electronics | 3 | * Copyright (c) 2004 Simtec Electronics |
4 | * Ben Dooks <ben@simtec.co.uk> | 4 | * Ben Dooks <ben@simtec.co.uk> |
5 | * | 5 | * |
6 | * S3C2410 - usb port information | 6 | * S3C - USB host port information |
7 | * | 7 | * |
8 | * This program is free software; you can redistribute it and/or modify | 8 | * This program is free software; you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License version 2 as | 9 | * it under the terms of the GNU General Public License version 2 as |
@@ -11,7 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #ifndef __ASM_ARCH_USBCONTROL_H | 13 | #ifndef __ASM_ARCH_USBCONTROL_H |
14 | #define __ASM_ARCH_USBCONTROL_H "arch/arm/mach-s3c2410/include/mach/usb-control.h" | 14 | #define __ASM_ARCH_USBCONTROL_H |
15 | 15 | ||
16 | #define S3C_HCDFLG_USED (1) | 16 | #define S3C_HCDFLG_USED (1) |
17 | 17 | ||