diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-11 23:35:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-11 23:35:13 -0400 |
| commit | cabc5c0f7fa1342049042d6e147db5a73773955b (patch) | |
| tree | 2be09ae1777d580c7dfe05d6d5b76e57281ec447 /scripts | |
| parent | b73d884756303316ead4cd7dad51236b2a515a1a (diff) | |
| parent | 86d710146fb9975f04c505ec78caa43d227c1018 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
arch/sparc/Kconfig
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/recordmcount.pl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl index 911ba7ffab84..090d300d7394 100755 --- a/scripts/recordmcount.pl +++ b/scripts/recordmcount.pl | |||
| @@ -57,7 +57,6 @@ | |||
| 57 | # call mcount (offset: 0x5) | 57 | # call mcount (offset: 0x5) |
| 58 | # [...] | 58 | # [...] |
| 59 | # ret | 59 | # ret |
| 60 | # .globl my_func | ||
| 61 | # other_func: | 60 | # other_func: |
| 62 | # [...] | 61 | # [...] |
| 63 | # call mcount (offset: 0x1b) | 62 | # call mcount (offset: 0x1b) |