diff options
author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-05-19 07:09:05 +0200 |
---|---|---|
committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-05-19 07:09:05 +0200 |
commit | c203e45f069af47ca7623e4dcd8c00bfba2722e4 (patch) | |
tree | 4563115b6565dcfd97015c1c9366fb3d07cabf19 /drivers/thermal/Makefile | |
parent | [XFS] Include linux/random.h in all builds, not just debug builds. (diff) | |
parent | Linux 2.6.26-rc3 (diff) | |
download | linux-c203e45f069af47ca7623e4dcd8c00bfba2722e4.tar.xz linux-c203e45f069af47ca7623e4dcd8c00bfba2722e4.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/thermal/Makefile')
-rw-r--r-- | drivers/thermal/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index 8ef1232de376..31108a01c22e 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -2,4 +2,4 @@ # Makefile for sensor chip drivers. # -obj-$(CONFIG_THERMAL) += thermal.o +obj-$(CONFIG_THERMAL) += thermal_sys.o |