Prev: block_dev: always serialize exclusive open attempts
Next: [PATCH] w100fb: fix building error caused by incorrect use of writel()
From: Rodolfo Giometti on 5 Aug 2010 05:20 On Thu, Aug 05, 2010 at 01:06:38AM +0400, Alexander Gordeev wrote: > 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(a)lvk.cs.msu.su> > --- > drivers/pps/kapi.c | 2 +- > include/linux/pps_kernel.h | 7 ++++++- > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/pps/kapi.c b/drivers/pps/kapi.c > index 1aa02db..55f3961 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 e0a193f..c930d11 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,6 @@ 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 */ > + > -- > 1.7.1 Acked-by: Rodolfo Giometti <giometti(a)linux.it> -- GNU/Linux Solutions e-mail: giometti(a)enneenne.com Linux Device Driver giometti(a)linux.it Embedded Systems phone: +39 349 2432127 UNIX programming skype: rodolfo.giometti Freelance ICT Italia - Consulente ICT Italia - www.consulenti-ict.it -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |