diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 18:24:00 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 18:24:00 +0200 |
commit | 83bd6998b04fc1bb7280b14f16b2bdbdc07c914b (patch) | |
tree | af1bbe2bac5752b69b1ac58bf5d822c735da439b /include/asm-blackfin/bfin_simple_timer.h | |
parent | e7250b8ae3870f37f660c2f65cafcaba85e3bfd3 (diff) | |
parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
download | talos-op-linux-83bd6998b04fc1bb7280b14f16b2bdbdc07c914b.tar.gz talos-op-linux-83bd6998b04fc1bb7280b14f16b2bdbdc07c914b.zip |
Merge commit 'v2.6.27-rc6' into timers/hpet
Diffstat (limited to 'include/asm-blackfin/bfin_simple_timer.h')
-rw-r--r-- | include/asm-blackfin/bfin_simple_timer.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/include/asm-blackfin/bfin_simple_timer.h b/include/asm-blackfin/bfin_simple_timer.h deleted file mode 100644 index fccbb595464a..000000000000 --- a/include/asm-blackfin/bfin_simple_timer.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _bfin_simple_timer_h_ -#define _bfin_simple_timer_h_ - -#include <linux/ioctl.h> - -#define BFIN_SIMPLE_TIMER_IOCTL_MAGIC 't' - -#define BFIN_SIMPLE_TIMER_SET_PERIOD _IO (BFIN_SIMPLE_TIMER_IOCTL_MAGIC, 2) -#define BFIN_SIMPLE_TIMER_START _IO (BFIN_SIMPLE_TIMER_IOCTL_MAGIC, 6) -#define BFIN_SIMPLE_TIMER_STOP _IO (BFIN_SIMPLE_TIMER_IOCTL_MAGIC, 8) -#define BFIN_SIMPLE_TIMER_READ _IO (BFIN_SIMPLE_TIMER_IOCTL_MAGIC, 10) - -#endif |