diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-02 00:35:16 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-02 00:35:16 -0500 |
| commit | aa4abc9bcce0d2a7ec189e897f8f8c58ca04643b (patch) | |
| tree | 22ef88d84a2e06380bb6a853c3ba28657e4e5f92 /arch/sparc | |
| parent | 814c01dc7c533033b4e99981a2e24a6195bfb43c (diff) | |
| parent | 52c0326beaa3cb0049d0f1c51c6ad5d4a04e4430 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-tx.c
net/8021q/vlan_core.c
net/core/dev.c
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/chmc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/kernel/chmc.c b/arch/sparc/kernel/chmc.c index 3b9f4d6e14a9..e1a9598e2a4d 100644 --- a/arch/sparc/kernel/chmc.c +++ b/arch/sparc/kernel/chmc.c | |||
| @@ -306,6 +306,7 @@ static int jbusmc_print_dimm(int syndrome_code, | |||
| 306 | buf[1] = '?'; | 306 | buf[1] = '?'; |
| 307 | buf[2] = '?'; | 307 | buf[2] = '?'; |
| 308 | buf[3] = '\0'; | 308 | buf[3] = '\0'; |
| 309 | return 0; | ||
| 309 | } | 310 | } |
| 310 | p = dp->controller; | 311 | p = dp->controller; |
| 311 | prop = &p->layout; | 312 | prop = &p->layout; |