diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-14 21:06:00 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-14 21:06:00 -0800 |
commit | b5139aeb22c8a28cac89b7f9a561bd9d4e2bb358 (patch) | |
tree | 83a245b25b27816d190b79bdb31003d3e8861deb /linux.c | |
parent | b0759feef87fcf820682cb36d65f2252c2cc12ae (diff) | |
parent | 0a9e5aa7353476d70c4eb9866aeda979118d04e5 (diff) | |
download | subsurface-b5139aeb22c8a28cac89b7f9a561bd9d4e2bb358.tar.gz |
Merge branch 'forlinus' of git://git.hohndel.org/subsurface
* 'forlinus' of git://git.hohndel.org/subsurface:
Return is not a function
Diffstat (limited to 'linux.c')
-rw-r--r-- | linux.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -49,5 +49,5 @@ void subsurface_close_conf(void) const char *subsurface_USB_name() { - return("/dev/ttyUSB0"); + return "/dev/ttyUSB0"; } |