Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 77460
b: refs/heads/master
c: 2a7057e
h: refs/heads/master
v: v3
  • Loading branch information
Jeff Garzik authored and Russell King committed Jan 26, 2008
1 parent 8fd3338 commit f4fdc96
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e8f2af17757b54db7f307b75e088489c480eb889
refs/heads/master: 2a7057e306b198e1e0d7db8615d8e9c69b880913
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/ssp.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ static int use_count[PXA_SSP_PORTS] = {0, 0, 0};

static irqreturn_t ssp_interrupt(int irq, void *dev_id)
{
struct ssp_dev *dev = (struct ssp_dev*) dev_id;
struct ssp_dev *dev = dev_id;
unsigned int status = SSSR_P(dev->port);

SSSR_P(dev->port) = status; /* clear status bits */
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-s3c2410/usb-simtec.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ usb_simtec_powercontrol(int port, int to)
static irqreturn_t
usb_simtec_ocirq(int irq, void *pw)
{
struct s3c2410_hcd_info *info = (struct s3c2410_hcd_info *)pw;
struct s3c2410_hcd_info *info = pw;

if (s3c2410_gpio_getpin(S3C2410_GPG10) == 0) {
pr_debug("usb_simtec: over-current irq (oc detected)\n");
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/plat-omap/mailbox.c
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ static void __mbox_rx_interrupt(struct omap_mbox *mbox)

static irqreturn_t mbox_interrupt(int irq, void *p)
{
struct omap_mbox *mbox = (struct omap_mbox *)p;
struct omap_mbox *mbox = p;

if (is_mbox_irq(mbox, IRQ_TX))
__mbox_tx_interrupt(mbox);
Expand Down
2 changes: 1 addition & 1 deletion trunk/sound/oss/waveartist.c
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@ static struct audio_driver waveartist_audio_driver = {
static irqreturn_t
waveartist_intr(int irq, void *dev_id)
{
wavnc_info *devc = (wavnc_info *)dev_id;
wavnc_info *devc = dev_id;
int irqstatus, status;

spin_lock(&waveartist_lock);
Expand Down

0 comments on commit f4fdc96

Please sign in to comment.