git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
arm
/
mach-s3c2410
/
usb-simtec.c
diff --git
a/arch/arm/mach-s3c2410/usb-simtec.c
b/arch/arm/mach-s3c2410/usb-simtec.c
index
495f8c6
..
22b0e1c
100644
(file)
--- a/
arch/arm/mach-s3c2410/usb-simtec.c
+++ b/
arch/arm/mach-s3c2410/usb-simtec.c
@@
-10,12
+10,6
@@
* 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
* published by the Free Software Foundation.
* 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
* published by the Free Software Foundation.
- *
- * Modifications:
- * 14-Sep-2004 BJD Created
- * 18-Oct-2004 BJD Cleanups, and added code to report OC cleared
- * 09-Aug-2005 BJD Renamed s3c2410_report_oc to s3c2410_usb_report_oc
- * 09-Aug-2005 BJD Ports powered only if both are enabled
*/
#define DEBUG
*/
#define DEBUG
@@
-64,7
+58,7
@@
usb_simtec_powercontrol(int port, int to)
}
static irqreturn_t
}
static irqreturn_t
-usb_simtec_ocirq(int irq, void *pw
, struct pt_regs *regs
)
+usb_simtec_ocirq(int irq, void *pw)
{
struct s3c2410_hcd_info *info = (struct s3c2410_hcd_info *)pw;
{
struct s3c2410_hcd_info *info = (struct s3c2410_hcd_info *)pw;
@@
-85,8
+79,8
@@
static void usb_simtec_enableoc(struct s3c2410_hcd_info *info, int on)
if (on) {
ret = request_irq(IRQ_USBOC, usb_simtec_ocirq,
if (on) {
ret = request_irq(IRQ_USBOC, usb_simtec_ocirq,
-
SA_INTERRUPT | SA
_TRIGGER_RISING |
-
SA
_TRIGGER_FALLING,
+
IRQF_DISABLED | IRQF
_TRIGGER_RISING |
+
IRQF
_TRIGGER_FALLING,
"USB Over-current", info);
if (ret != 0) {
printk(KERN_ERR "failed to request usb oc irq\n");
"USB Over-current", info);
if (ret != 0) {
printk(KERN_ERR "failed to request usb oc irq\n");