diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /arch/mips/bcm63xx/prom.c | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/mips/bcm63xx/prom.c')
| -rw-r--r-- | arch/mips/bcm63xx/prom.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/mips/bcm63xx/prom.c b/arch/mips/bcm63xx/prom.c index fb284fbc5853..be252efa0757 100644 --- a/arch/mips/bcm63xx/prom.c +++ b/arch/mips/bcm63xx/prom.c | |||
| @@ -40,9 +40,6 @@ void __init prom_init(void) | |||
| 40 | reg &= ~mask; | 40 | reg &= ~mask; |
| 41 | bcm_perf_writel(reg, PERF_CKCTL_REG); | 41 | bcm_perf_writel(reg, PERF_CKCTL_REG); |
| 42 | 42 | ||
| 43 | /* assign command line from kernel config */ | ||
| 44 | strcpy(arcs_cmdline, CONFIG_CMDLINE); | ||
| 45 | |||
| 46 | /* register gpiochip */ | 43 | /* register gpiochip */ |
| 47 | bcm63xx_gpio_init(); | 44 | bcm63xx_gpio_init(); |
| 48 | 45 | ||