diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /arch/arm/mach-s3c2410/usb-simtec.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'arch/arm/mach-s3c2410/usb-simtec.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/usb-simtec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/usb-simtec.c b/arch/arm/mach-s3c2410/usb-simtec.c index c635efa7cd31..22b0e1cdd4bf 100644 --- a/arch/arm/mach-s3c2410/usb-simtec.c +++ b/arch/arm/mach-s3c2410/usb-simtec.c | |||
| @@ -58,7 +58,7 @@ usb_simtec_powercontrol(int port, int to) | |||
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | static irqreturn_t | 60 | static irqreturn_t |
| 61 | usb_simtec_ocirq(int irq, void *pw, struct pt_regs *regs) | 61 | usb_simtec_ocirq(int irq, void *pw) |
| 62 | { | 62 | { |
| 63 | struct s3c2410_hcd_info *info = (struct s3c2410_hcd_info *)pw; | 63 | struct s3c2410_hcd_info *info = (struct s3c2410_hcd_info *)pw; |
| 64 | 64 | ||