diff options
| author | Paul Mackerras <paulus@samba.org> | 2009-04-22 13:02:09 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2009-04-22 13:02:09 +1000 |
| commit | 5bd3ef84d73c2ea7b4babbad060909753c4828d4 (patch) | |
| tree | fdf2bafb48ae1ed03175f6c77a7548a181e69ee9 /drivers/char/cyclades.c | |
| parent | 0658c16056660886ea2f35c4f038be70a94b1532 (diff) | |
| parent | 6d25b688ecc488753af3c9e6f6a9a575b863cf37 (diff) | |
| download | linux-5bd3ef84d73c2ea7b4babbad060909753c4828d4.tar.gz linux-5bd3ef84d73c2ea7b4babbad060909753c4828d4.tar.bz2 linux-5bd3ef84d73c2ea7b4babbad060909753c4828d4.zip | |
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge
Diffstat (limited to 'drivers/char/cyclades.c')
| -rw-r--r-- | drivers/char/cyclades.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c index 272db0e2b491..1fdb9f657d8f 100644 --- a/drivers/char/cyclades.c +++ b/drivers/char/cyclades.c @@ -646,6 +646,7 @@ #include <linux/spinlock.h> #include <linux/bitops.h> #include <linux/firmware.h> +#include <linux/device.h> #include <asm/system.h> #include <linux/io.h> @@ -5408,3 +5409,4 @@ module_exit(cy_cleanup_module); MODULE_LICENSE("GPL"); MODULE_VERSION(CY_VERSION); +MODULE_ALIAS_CHARDEV_MAJOR(CYCLADES_MAJOR); |