diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
| commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
| tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /arch/mips/mipssim/sim_time.c | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
| parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
Diffstat (limited to 'arch/mips/mipssim/sim_time.c')
| -rw-r--r-- | arch/mips/mipssim/sim_time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mipssim/sim_time.c b/arch/mips/mipssim/sim_time.c index e39bbe989da3..881ecbc1fa23 100644 --- a/arch/mips/mipssim/sim_time.c +++ b/arch/mips/mipssim/sim_time.c | |||
| @@ -83,7 +83,7 @@ static void mips_timer_dispatch(void) | |||
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | 85 | ||
| 86 | unsigned __init get_c0_compare_int(void) | 86 | unsigned __cpuinit get_c0_compare_int(void) |
| 87 | { | 87 | { |
| 88 | #ifdef MSC01E_INT_BASE | 88 | #ifdef MSC01E_INT_BASE |
| 89 | if (cpu_has_veic) { | 89 | if (cpu_has_veic) { |