summaryrefslogtreecommitdiff
path: root/drivers/w1
diff options
context:
space:
mode:
authorQuinn Jensen <quinn.jensen@freescale.com>2007-05-24 18:13:50 -0600
committerQuinn Jensen <quinn.jensen@freescale.com>2007-05-24 18:13:50 -0600
commit4e6ff4e1020f03c470e8f61e4ffa70af1f6465b0 (patch)
treedc06737e7278e3699a8444631ed934c80d5736fe /drivers/w1
parent057e4ecfe2eb6cf841e5c019cc2e498bb549bf14 (diff)
Sanitization of kernel source following import of GSO L2618-2 patches.
http://www.bitshrine.org/gpp/linux-2.6.19.2-mx-L2618-2_scrub.patch
Diffstat (limited to 'drivers/w1')
-rw-r--r--drivers/w1/masters/mxc_w1.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
index 9ac5c646cfc0..462af54b48f5 100644
--- a/drivers/w1/masters/mxc_w1.c
+++ b/drivers/w1/masters/mxc_w1.c
@@ -185,8 +185,7 @@ static u8 mxc_w1_read_byte(void *data)
reg_val = __raw_readb((dev->base_address + MXC_W1_TXRX));
return reg_val;
}
-static irqreturn_t w1_interrupt_handler(int irq, void *data,
- struct pt_regs *regs)
+static irqreturn_t w1_interrupt_handler(int irq, void *data)
{
u8 reg_val;
irqreturn_t ret = IRQ_NONE;