summaryrefslogtreecommitdiff
path: root/inotail.h
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2009-01-24 13:44:33 +0100
committerTobias Klauser <tklauser@distanz.ch>2009-01-24 13:44:33 +0100
commita247ef9e83192dd5197ab13abac57acea2c9971f (patch)
tree8313ed26f68334667fd88d6dc85d0a15dba5be2e /inotail.h
parent03a70c5519c75abd4e09509434ba11d39aad1a2f (diff)
parentf6ae74eb0e94facb9fea8002ea86b5af1f6e593e (diff)
Merge branch 'master' into followname
Conflicts: inotail.c
Diffstat (limited to 'inotail.h')
-rw-r--r--inotail.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/inotail.h b/inotail.h
index 4c1ca4d..93011e6 100644
--- a/inotail.h
+++ b/inotail.h
@@ -8,7 +8,7 @@
#define _INOTAIL_H
#include <sys/types.h>
-#include "inotify.h"
+#include <sys/inotify.h>
#define DEFAULT_N_LINES 10 /* Number of items to tail. */
ions'>+0 2013-01-31arm: arch_timer: balance device_node refcountingMark Rutland1-0/+2 2012-09-26ARM: 7538/1: delay: add registration mechanism for delay timer sourcesJonathan Austin1-9/+8 2012-09-15ARM: 7522/1: arch_timers: register a time/cycle counterMarc Zyngier1-0/+25 2012-09-15ARM: 7523/1: arch_timers: enable the use of the virtual timerMarc Zyngier1-102/+241 2012-07-27Merge branches 'audit', 'delay', 'fixes', 'misc' and 'sta2x11' into for-linusRussell King1-1/+12 2012-07-09ARM: 7452/1: delay: allow timer-based delay implementation to be selectedWill Deacon1-0/+3 2012-07-09ARM: 7451/1: arch timer: implement read_current_timer and get_cyclesWill Deacon1-0/+8 2012-07-09ARM: 7444/1: kernel: add arch-timer C3STOP featureLorenzo Pieralisi1-1/+1 2012-04-27ARM: architected timers: remove support for non DT platformsMarc Zyngier1-17/+2 2012-04-27ARM: architected timers: add support for UP timerMarc Zyngier1-0/+13 2012-04-27ARM: architected timers: add DT supportMarc Zyngier1-7/+46 2012-04-27ARM: architected timers: Add A15 specific sched_clock implementationMarc Zyngier1-0/+25 2012-04-27ARM: local timers: Add A15 architected timer supportMarc Zyngier1-0/+288