diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/mips/bcm63xx/prom.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
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 | ||