diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-12 09:27:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-12 09:27:53 -0700 |
| commit | f1c7404e37a8970bd58cc10a6d96534d42b9aac6 (patch) | |
| tree | c7d067f08f7ceca58f29526cb498c92e654ee400 /drivers | |
| parent | 8c57a8fa4e9226a44c4e98327852936df3b6791b (diff) | |
| parent | 0796e75503adc6b0a119493ce2e599fb5fd8f96e (diff) | |
| download | blackbird-op-linux-f1c7404e37a8970bd58cc10a6d96534d42b9aac6.tar.gz blackbird-op-linux-f1c7404e37a8970bd58cc10a6d96534d42b9aac6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sunhme: Fix qfe parent detection.
sparc64: Fix lost interrupts on sun4u.
sparc64: wait_event_interruptible_timeout may return -ERESTARTSYS
jsflash: stop defining MAJOR_NR
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/sunhme.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/char/bbc_i2c.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/char/jsflash.c | 3 |
3 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index d4fb4acdbebd..4e9bd380a5c2 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c @@ -2649,8 +2649,6 @@ static int __devinit happy_meal_sbus_probe_one(struct of_device *op, int is_qfe) int err = -ENODEV; sbus_dp = to_of_device(op->dev.parent)->node; - if (is_qfe) - sbus_dp = to_of_device(op->dev.parent->parent)->node; /* We can match PCI devices too, do not accept those here. */ if (strcmp(sbus_dp->name, "sbus")) diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c index f08e169ba1b5..7e30e5f6e032 100644 --- a/drivers/sbus/char/bbc_i2c.c +++ b/drivers/sbus/char/bbc_i2c.c @@ -129,7 +129,7 @@ static int wait_for_pin(struct bbc_i2c_bus *bp, u8 *status) bp->waiting = 1; add_wait_queue(&bp->wq, &wait); while (limit-- > 0) { - unsigned long val; + long val; val = wait_event_interruptible_timeout( bp->wq, diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c index a9a9893a5f95..e6d1fc8c54f1 100644 --- a/drivers/sbus/char/jsflash.c +++ b/drivers/sbus/char/jsflash.c @@ -38,9 +38,6 @@ #include <linux/string.h> #include <linux/genhd.h> #include <linux/blkdev.h> - -#define MAJOR_NR JSFD_MAJOR - #include <asm/uaccess.h> #include <asm/pgtable.h> #include <asm/io.h> |
