summaryrefslogtreecommitdiffstats
path: root/drivers/sn
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-10-11 04:59:46 -0400
committerJeff Garzik <jeff@garzik.org>2006-10-11 04:59:46 -0400
commit701328a7b58d50d8640c21ba5fdf3170b1ddac16 (patch)
tree99a3fe44310a97e92ad1cb3a01f2ee3f6ed0d59a /drivers/sn
parent53e36ada37cb8b01cfbf674580a79edc0bb764c7 (diff)
parent53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff)
downloadkernel-crypto-701328a7b58d50d8640c21ba5fdf3170b1ddac16.tar.gz
kernel-crypto-701328a7b58d50d8640c21ba5fdf3170b1ddac16.tar.xz
kernel-crypto-701328a7b58d50d8640c21ba5fdf3170b1ddac16.zip
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/sn')
-rw-r--r--drivers/sn/ioc3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/sn/ioc3.c b/drivers/sn/ioc3.c
index 3d91b6b9287..cd6b65333b7 100644
--- a/drivers/sn/ioc3.c
+++ b/drivers/sn/ioc3.c
@@ -401,7 +401,7 @@ static inline uint32_t get_pending_intrs(struct ioc3_driver_data *idd)
static irqreturn_t ioc3_intr_io(int irq, void *arg)
{
unsigned long flags;
- struct ioc3_driver_data *idd = (struct ioc3_driver_data *)arg;
+ struct ioc3_driver_data *idd = arg;
int handled = 1, id;
unsigned int pending;