diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-16 20:56:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-16 20:56:49 -0800 |
| commit | a1bc5cdf9f9550bd7e9e5d8400e95b164165b275 (patch) | |
| tree | 3d4e80bb369675765e39450c55c6140e1213da81 /arch/ia64/kernel/perfmon.c | |
| parent | 8dca6f33f026dc8a7fc2710b78a7521e899bd611 (diff) | |
| parent | 859538763155814d217054eb6e3cdff71bdb4d89 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/kernel/perfmon.c')
| -rw-r--r-- | arch/ia64/kernel/perfmon.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index bd87cb6b7a8..2ea4b39efff 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c @@ -628,9 +628,11 @@ static int pfm_write_ibr_dbr(int mode, pfm_context_t *ctx, void *arg, int count, #include "perfmon_itanium.h" #include "perfmon_mckinley.h" +#include "perfmon_montecito.h" #include "perfmon_generic.h" static pmu_config_t *pmu_confs[]={ + &pmu_conf_mont, &pmu_conf_mck, &pmu_conf_ita, &pmu_conf_gen, /* must be last */ |