diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-08 12:22:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-08 12:22:53 -0400 |
| commit | 46056be71c37378f518711da651e4bb76d650ee9 (patch) | |
| tree | 63c563bc3b84f22b517114ebb101b991958228a4 /drivers | |
| parent | 5284c6b99ea017f73c09b50f34a637ff9d5d26a0 (diff) | |
| parent | 5636919b5c909fee54a6ef5226475ecae012ad02 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: Outline udelay and fix a few issues.
MIPS: ioctl.h: Fix headers_check warnings
MIPS: Cobalt: PCI bus is always required to obtain the board ID
MIPS: Kconfig: Remove "Support for" from Cavium system type
MIPS: Sibyte: Honor CONFIG_CMDLINE
SSB: BCM47xx: Export ssb_watchdog_timer_set
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ssb/embedded.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ssb/embedded.c b/drivers/ssb/embedded.c index 7dc3a6b41397..a0e0d246b592 100644 --- a/drivers/ssb/embedded.c +++ b/drivers/ssb/embedded.c | |||
| @@ -29,6 +29,7 @@ int ssb_watchdog_timer_set(struct ssb_bus *bus, u32 ticks) | |||
| 29 | } | 29 | } |
| 30 | return -ENODEV; | 30 | return -ENODEV; |
| 31 | } | 31 | } |
| 32 | EXPORT_SYMBOL(ssb_watchdog_timer_set); | ||
| 32 | 33 | ||
| 33 | u32 ssb_gpio_in(struct ssb_bus *bus, u32 mask) | 34 | u32 ssb_gpio_in(struct ssb_bus *bus, u32 mask) |
| 34 | { | 35 | { |