diff options
author | Joel Becker <jlbec@evilplan.org> | 2011-08-22 06:02:57 +0200 |
---|---|---|
committer | Joel Becker <jlbec@evilplan.org> | 2011-08-22 06:02:57 +0200 |
commit | 99b1bb61b225c3eb4d3b196d4f1d041695b19a7e (patch) | |
tree | 06cabdc34538f3b38a39e3b802ecc1a2ab2aae00 /arch/alpha/include/asm/8253pit.h | |
parent | ocfs2: Avoid livelock in ocfs2_readpage() (diff) | |
parent | ocfs2: Implement llseek() (diff) | |
download | linux-99b1bb61b225c3eb4d3b196d4f1d041695b19a7e.tar.xz linux-99b1bb61b225c3eb4d3b196d4f1d041695b19a7e.zip |
Merge branch 'mw-3.1-jul25' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-fixes
Diffstat (limited to 'arch/alpha/include/asm/8253pit.h')
-rw-r--r-- | arch/alpha/include/asm/8253pit.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/alpha/include/asm/8253pit.h b/arch/alpha/include/asm/8253pit.h deleted file mode 100644 index a71c9c1455a7..000000000000 --- a/arch/alpha/include/asm/8253pit.h +++ /dev/null @@ -1,3 +0,0 @@ -/* - * 8253/8254 Programmable Interval Timer - */ |