diff options
| author | Alexander Gordeev <lasaine@lvk.cs.msu.su> | 2011-01-12 17:00:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 08:03:19 -0800 |
| commit | 7a21a3cc0be92e70474cc2ab06cb074f6a7c3f09 (patch) | |
| tree | 2a220ba224b023b3f8a8c376184b9385cfcafcee | |
| parent | 9ab020cf07e457a8b425bf5af17e704f90f86d8b (diff) | |
| download | linux-3.10-7a21a3cc0be92e70474cc2ab06cb074f6a7c3f09.tar.gz linux-3.10-7a21a3cc0be92e70474cc2ab06cb074f6a7c3f09.tar.bz2 linux-3.10-7a21a3cc0be92e70474cc2ab06cb074f6a7c3f09.zip | |
pps: trivial fixes
Here are some very trivial fixes combined:
- add macro definitions to protect header file from including several times
- remove declaration for an unexistent array
- fix typos
Signed-off-by: Alexander Gordeev <lasaine@lvk.cs.msu.su>
Acked-by: Rodolfo Giometti <giometti@linux.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/pps/kapi.c | 2 | ||||
| -rw-r--r-- | include/linux/pps_kernel.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/pps/kapi.c b/drivers/pps/kapi.c index 1aa02db3ff4..55f39618261 100644 --- a/drivers/pps/kapi.c +++ b/drivers/pps/kapi.c @@ -324,7 +324,7 @@ void pps_event(int source, struct pps_ktime *ts, int event, void *data) captured = ~0; } - /* Wake up iif captured somthing */ + /* Wake up if captured something */ if (captured) { pps->go = ~0; wake_up_interruptible(&pps->queue); diff --git a/include/linux/pps_kernel.h b/include/linux/pps_kernel.h index e0a193f830e..23f63c3263b 100644 --- a/include/linux/pps_kernel.h +++ b/include/linux/pps_kernel.h @@ -18,6 +18,9 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef LINUX_PPS_KERNEL_H +#define LINUX_PPS_KERNEL_H + #include <linux/pps.h> #include <linux/cdev.h> @@ -71,7 +74,6 @@ struct pps_device { extern spinlock_t pps_idr_lock; extern struct idr pps_idr; -extern struct timespec pps_irq_ts[]; extern struct device_attribute pps_attrs[]; @@ -87,3 +89,5 @@ extern void pps_unregister_source(int source); extern int pps_register_cdev(struct pps_device *pps); extern void pps_unregister_cdev(struct pps_device *pps); extern void pps_event(int source, struct pps_ktime *ts, int event, void *data); + +#endif /* LINUX_PPS_KERNEL_H */ |