Commit 49121aa1 authored by Ben Dooks's avatar Ben Dooks Committed by Greg Kroah-Hartman
Browse files

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: default avatarBen Dooks <ben@simtec.co.uk>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3ba5f38f

arch/arm/mach-s3c2410/usb-simtec.c

+2 −1
Original line number Diff line number Diff line
@@ -29,13 +29,14 @@ 


#include <mach/bast-map.h>

#include <mach/bast-irq.h>

#include <mach/usb-control.h>

#include <mach/regs-gpio.h>



#include <mach/hardware.h>

#include <asm/irq.h>



#include <plat/usb-control.h>

#include <plat/devs.h>



#include "usb-simtec.h"



/* control power and monitor over-current events on various Simtec

arch/arm/mach-s3c2410/include/mach/usb-control.h→arch/arm/plat-s3c/include/plat/usb-control.h

+3 −3
Original line number Diff line number Diff line 
/* arch/arm/mach-s3c2410/include/mach/usb-control.h

/* arch/arm/plat-s3c/include/plat/usb-control.h

 *

 * Copyright (c) 2004 Simtec Electronics

 *	Ben Dooks <ben@simtec.co.uk>

 *

 * S3C2410 - usb port information

 * S3C - USB host port information

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as
@@ -11,7 +11,7 @@ 
*/



#ifndef __ASM_ARCH_USBCONTROL_H

#define __ASM_ARCH_USBCONTROL_H "arch/arm/mach-s3c2410/include/mach/usb-control.h"

#define __ASM_ARCH_USBCONTROL_H



#define S3C_HCDFLG_USED	(1)

drivers/usb/host/ohci-s3c2410.c

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ 


#include <linux/platform_device.h>

#include <linux/clk.h>



#include <mach/usb-control.h>

#include <plat/usb-control.h>



#define valid_port(idx) ((idx) == 1 || (idx) == 2)

CRA Git | Maintained and supported by SUSTech CRA and CCSE