Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Ben Dooks and committed by
Greg Kroah-Hartman
49121aa1 3ba5f38f

+6 -6
+3 -3
arch/arm/mach-s3c2410/include/mach/usb-control.h arch/arm/plat-s3c/include/plat/usb-control.h
··· 1 - /* arch/arm/mach-s3c2410/include/mach/usb-control.h 1 + /* arch/arm/plat-s3c/include/plat/usb-control.h 2 2 * 3 3 * Copyright (c) 2004 Simtec Electronics 4 4 * Ben Dooks <ben@simtec.co.uk> 5 5 * 6 - * S3C2410 - usb port information 6 + * S3C - USB host port information 7 7 * 8 8 * This program is free software; you can redistribute it and/or modify 9 9 * it under the terms of the GNU General Public License version 2 as ··· 11 11 */ 12 12 13 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 16 #define S3C_HCDFLG_USED (1) 17 17
+2 -1
arch/arm/mach-s3c2410/usb-simtec.c
··· 29 29 30 30 #include <mach/bast-map.h> 31 31 #include <mach/bast-irq.h> 32 - #include <mach/usb-control.h> 33 32 #include <mach/regs-gpio.h> 34 33 35 34 #include <mach/hardware.h> 36 35 #include <asm/irq.h> 37 36 37 + #include <plat/usb-control.h> 38 38 #include <plat/devs.h> 39 + 39 40 #include "usb-simtec.h" 40 41 41 42 /* control power and monitor over-current events on various Simtec
+1 -2
drivers/usb/host/ohci-s3c2410.c
··· 21 21 22 22 #include <linux/platform_device.h> 23 23 #include <linux/clk.h> 24 - 25 - #include <mach/usb-control.h> 24 + #include <plat/usb-control.h> 26 25 27 26 #define valid_port(idx) ((idx) == 1 || (idx) == 2) 28 27