diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
| commit | f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544 (patch) | |
| tree | 4c7abed6047538c13dd024a8ecffd15f31b4609a /arch/mips/bcm63xx/prom.c | |
| parent | 84549d239ab9bb2e3a85c6efcf0e6478a38b4260 (diff) | |
| parent | 40aa7030e5213a43e9e0554fd7f95534ea310bf3 (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
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 fb284fbc585..be252efa075 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 | ||