diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-23 12:25:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-23 12:25:24 -0400 |
| commit | 12a37b5e2c93f6550b82490c3de6d4eedc509c39 (patch) | |
| tree | 8407735b0d569792ec255a2627b533e403d60663 /drivers | |
| parent | 53da1d9456fe7f87a920a78fdbdcf1225d197cb7 (diff) | |
| parent | 0702b30dd821ac8a4103ddbe545518713fdca9be (diff) | |
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:
sparc64: Fix crash with /proc/iomem
sparc64: Reschedule KGDB capture to a software interrupt.
sbus: Auto-load openprom module when device opened.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/sbus/char/openprom.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c index 29dc735e1a20..124f660a0383 100644 --- a/drivers/sbus/char/openprom.c +++ b/drivers/sbus/char/openprom.c | |||
| @@ -51,6 +51,7 @@ MODULE_AUTHOR("Thomas K. Dyas (tdyas@noc.rutgers.edu) and Eddie C. Dost (ecd@sk | |||
| 51 | MODULE_DESCRIPTION("OPENPROM Configuration Driver"); | 51 | MODULE_DESCRIPTION("OPENPROM Configuration Driver"); |
| 52 | MODULE_LICENSE("GPL"); | 52 | MODULE_LICENSE("GPL"); |
| 53 | MODULE_VERSION("1.0"); | 53 | MODULE_VERSION("1.0"); |
| 54 | MODULE_ALIAS_MISCDEV(SUN_OPENPROM_MINOR); | ||
| 54 | 55 | ||
| 55 | /* Private data kept by the driver for each descriptor. */ | 56 | /* Private data kept by the driver for each descriptor. */ |
| 56 | typedef struct openprom_private_data | 57 | typedef struct openprom_private_data |