diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:48:49 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:48:49 -0400 |
| commit | c3cc99ff5d24e2eeaf7ec2032e720681916990e3 (patch) | |
| tree | c3e74171bbbd2adde9d60b9db1c440415c8d2831 /drivers/misc/phantom.c | |
| parent | 38ffbe66d59051fd9cfcfc8545f164700e2fa3bc (diff) | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'drivers/misc/phantom.c')
| -rw-r--r-- | drivers/misc/phantom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/phantom.c b/drivers/misc/phantom.c index 4ce3bdc2f959..daf585689ce3 100644 --- a/drivers/misc/phantom.c +++ b/drivers/misc/phantom.c | |||
| @@ -563,6 +563,6 @@ module_init(phantom_init); | |||
| 563 | module_exit(phantom_exit); | 563 | module_exit(phantom_exit); |
| 564 | 564 | ||
| 565 | MODULE_AUTHOR("Jiri Slaby <jirislaby@gmail.com>"); | 565 | MODULE_AUTHOR("Jiri Slaby <jirislaby@gmail.com>"); |
| 566 | MODULE_DESCRIPTION("Sensable Phantom driver"); | 566 | MODULE_DESCRIPTION("Sensable Phantom driver (PCI devices)"); |
| 567 | MODULE_LICENSE("GPL"); | 567 | MODULE_LICENSE("GPL"); |
| 568 | MODULE_VERSION(PHANTOM_VERSION); | 568 | MODULE_VERSION(PHANTOM_VERSION); |