mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-27 03:10:12 +00:00
Code Issues Releases Wiki Activity

USB: S3C: Move usb-control.h to platform include

Browse source 
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>
This commit is contained in:
Ben Dooks 2009-03-07 11:44:21 +00:00 committed by Greg Kroah-Hartman
parent 3ba5f38f3d
commit 49121aa14c
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/mach-s3c2410/usb-simtec.c
View file

@ -29,13 +29,14 @@
#include <mach/bast-map.h> #include <mach/bast-map.h>
#include <mach/bast-irq.h> #include <mach/bast-irq.h>
#include <mach/usb-control.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <plat/usb-control.h>
#include <plat/devs.h> #include <plat/devs.h>
#include "usb-simtec.h" #include "usb-simtec.h"
/* control power and monitor over-current events on various Simtec /* control power and monitor over-current events on various Simtec

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

@ -1,9 +1,9 @@
/* arch/arm/mach-s3c2410/include/mach/usb-control.h /* arch/arm/plat-s3c/include/plat/usb-control.h
* *
* Copyright (c) 2004 Simtec Electronics * Copyright (c) 2004 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk> * 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 * 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 * it under the terms of the GNU General Public License version 2 as
@ -11,7 +11,7 @@
*/ */
#ifndef __ASM_ARCH_USBCONTROL_H #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) #define S3C_HCDFLG_USED (1)

3
drivers/usb/host/ohci-s3c2410.c
View file

@ -21,8 +21,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <plat/usb-control.h>
#include <mach/usb-control.h>
#define valid_port(idx) ((idx) == 1 || (idx) == 2) #define valid_port(idx) ((idx) == 1 || (idx) == 2)