summaryrefslogtreecommitdiffstats
path: root/include/asm-x86_64/therm_throt.h
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-10-13 15:58:23 +0200
committerDavid Woodhouse <dwmw2@infradead.org>2007-10-13 15:58:23 +0200
commitebf8889bd1fe3615991ff4494635d237280652a2 (patch)
tree10fb735717122bbb86474339eac07f26e7ccdf40 /include/asm-x86_64/therm_throt.h
parentMerge Linux 2.6.23 (diff)
parentx86/pci/acpi: fix DMI const-ification fallout (diff)
downloadlinux-ebf8889bd1fe3615991ff4494635d237280652a2.tar.xz
linux-ebf8889bd1fe3615991ff4494635d237280652a2.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-x86_64/therm_throt.h')
-rw-r--r--include/asm-x86_64/therm_throt.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-x86_64/therm_throt.h b/include/asm-x86_64/therm_throt.h
deleted file mode 100644
index 5aac059007ba..000000000000
--- a/include/asm-x86_64/therm_throt.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-i386/therm_throt.h>