Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 105991
b: refs/heads/master
c: ec905a1
h: refs/heads/master
i:
  105989: 8335b6c
  105987: c12c4fe
  105983: 9be9cc8
v: v3
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Jul 25, 2008
1 parent dff7670 commit 640f5bb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ace7dd96695769f9d76980c7e52139e73228221c
refs/heads/master: ec905a18656daa4d9300bad2bebc02d5dba7883d
4 changes: 3 additions & 1 deletion trunk/drivers/misc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,13 @@ config IBM_ASM
for your IBM server.

config PHANTOM
tristate "Sensable PHANToM"
tristate "Sensable PHANToM (PCI)"
depends on PCI
help
Say Y here if you want to build a driver for Sensable PHANToM device.

This driver is only for PCI PHANToMs.

If you choose to build module, its name will be phantom. If unsure,
say N here.

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/misc/phantom.c
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,6 @@ module_init(phantom_init);
module_exit(phantom_exit);

MODULE_AUTHOR("Jiri Slaby <jirislaby@gmail.com>");
MODULE_DESCRIPTION("Sensable Phantom driver");
MODULE_DESCRIPTION("Sensable Phantom driver (PCI devices)");
MODULE_LICENSE("GPL");
MODULE_VERSION(PHANTOM_VERSION);

0 comments on commit 640f5bb

Please sign in to comment.