diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
| commit | 65b53e4cc90e59936733b3b95b9451d2ca47528d (patch) | |
| tree | 29932718192962671c48c3fd1ea017a6112459e8 /arch/parisc/kernel/perf_asm.S | |
| parent | 788c0a53164c05c5ccdb1472474372b72ba74644 (diff) | |
| parent | 2e761e0532a784816e7e822dbaaece8c5d4be14d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/mac80211/ieee80211_i.h
Diffstat (limited to 'arch/parisc/kernel/perf_asm.S')
| -rw-r--r-- | arch/parisc/kernel/perf_asm.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/parisc/kernel/perf_asm.S b/arch/parisc/kernel/perf_asm.S index 43874ca3ed67..d411dfb5b6d1 100644 --- a/arch/parisc/kernel/perf_asm.S +++ b/arch/parisc/kernel/perf_asm.S | |||
| @@ -20,6 +20,8 @@ | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <asm/assembly.h> | 22 | #include <asm/assembly.h> |
| 23 | |||
| 24 | #include <linux/init.h> | ||
| 23 | #include <linux/linkage.h> | 25 | #include <linux/linkage.h> |
| 24 | 26 | ||
| 25 | #ifdef CONFIG_64BIT | 27 | #ifdef CONFIG_64BIT |
| @@ -41,7 +43,7 @@ | |||
| 41 | ; The coprocessor only needs to be enabled when | 43 | ; The coprocessor only needs to be enabled when |
| 42 | ; starting/stopping the coprocessor with the pmenb/pmdis. | 44 | ; starting/stopping the coprocessor with the pmenb/pmdis. |
| 43 | ; | 45 | ; |
| 44 | .text | 46 | __HEAD |
| 45 | 47 | ||
| 46 | ENTRY(perf_intrigue_enable_perf_counters) | 48 | ENTRY(perf_intrigue_enable_perf_counters) |
| 47 | .proc | 49 | .proc |