Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754970Ab0KXQXf (ORCPT ); Wed, 24 Nov 2010 11:23:35 -0500 Received: from gate.lvk.cs.msu.su ([158.250.17.1]:44311 "EHLO mail.lvk.cs.msu.su" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754020Ab0KXQXd (ORCPT ); Wed, 24 Nov 2010 11:23:33 -0500 X-Spam-ASN: From: Alexander Gordeev To: linux-kernel@vger.kernel.org Cc: "Nikita V\. Youshchenko" , linuxpps@ml.enneenne.com, Rodolfo Giometti , Alexander Gordeev , Tejun Heo , John Stultz Subject: [PATCHv5 01/17] pps: trivial fixes Date: Wed, 24 Nov 2010 19:15:39 +0300 Message-Id: <16bd98f4fdaf4fecae734a099d2d116f67622b21.1290599843.git.lasaine@lvk.cs.msu.su> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: References: X-AV-Checked: ClamAV using ClamSMTP Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1924 Lines: 62 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 Acked-by: Rodolfo Giometti Signed-off-by: Alexander Gordeev --- 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 #include @@ -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.2.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/