diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /include/asm-xtensa/param.h | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'include/asm-xtensa/param.h')
| -rw-r--r-- | include/asm-xtensa/param.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-xtensa/param.h b/include/asm-xtensa/param.h index c0eec8260b0e..6f281392e3f8 100644 --- a/include/asm-xtensa/param.h +++ b/include/asm-xtensa/param.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #ifndef _XTENSA_PARAM_H | 11 | #ifndef _XTENSA_PARAM_H |
| 12 | #define _XTENSA_PARAM_H | 12 | #define _XTENSA_PARAM_H |
| 13 | 13 | ||
| 14 | #include <xtensa/config/core.h> | 14 | #include <asm/variant/core.h> |
| 15 | 15 | ||
| 16 | #ifdef __KERNEL__ | 16 | #ifdef __KERNEL__ |
| 17 | # define HZ 100 /* internal timer frequency */ | 17 | # define HZ 100 /* internal timer frequency */ |