diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
| commit | bb803cfbecb03a0cf8dc7e1864f18dda6631af00 (patch) | |
| tree | 6c0989693bea6f50cfa5c6bb14f52ec19668def3 /arch/powerpc/platforms/pasemi | |
| parent | 3878fb6fdbceecca20b15748f807340854220f06 (diff) | |
| parent | 511e11e396dc596825ce04d53d7f6d579404bc01 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/scsi/fcoe/fcoe.c
Diffstat (limited to 'arch/powerpc/platforms/pasemi')
| -rw-r--r-- | arch/powerpc/platforms/pasemi/setup.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c index c64fb5bfb37e..153051eb6d93 100644 --- a/arch/powerpc/platforms/pasemi/setup.c +++ b/arch/powerpc/platforms/pasemi/setup.c | |||
| @@ -44,10 +44,6 @@ | |||
| 44 | 44 | ||
| 45 | #include "pasemi.h" | 45 | #include "pasemi.h" |
| 46 | 46 | ||
| 47 | #if !defined(CONFIG_SMP) | ||
| 48 | static void smp_send_stop(void) {} | ||
| 49 | #endif | ||
| 50 | |||
| 51 | /* SDC reset register, must be pre-mapped at reset time */ | 47 | /* SDC reset register, must be pre-mapped at reset time */ |
| 52 | static void __iomem *reset_reg; | 48 | static void __iomem *reset_reg; |
| 53 | 49 | ||