X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fparisc%2Fkernel%2Fsetup.c;h=820adb178f701f4302ce65fcc761e343ca03474a;hb=1be35e94e1da3669db492995cd2c8b1a37016b11;hp=37bd6a607b95a22639f8bc068325c186f9630c4d;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c index 37bd6a607..820adb178 100644 --- a/arch/parisc/kernel/setup.c +++ b/arch/parisc/kernel/setup.c @@ -44,15 +44,14 @@ #include /* for pa7300lc_init() proto */ #include #include -#include +#define COMMAND_LINE_SIZE 1024 +char saved_command_line[COMMAND_LINE_SIZE]; char command_line[COMMAND_LINE_SIZE]; /* Intended for ccio/sba/cpu statistics under /proc/bus/{runway|gsc} */ struct proc_dir_entry * proc_runway_root = NULL; struct proc_dir_entry * proc_gsc_root = NULL; -struct proc_dir_entry * proc_mckinley_root = NULL; - void __init setup_cmdline(char **cmdline_p) { @@ -208,17 +207,12 @@ static void __init parisc_proc_mkdir(void) case pcxw: case pcxw_: case pcxw2: + case mako: /* XXX : this is really mckinley bus */ if (NULL == proc_runway_root) { proc_runway_root = proc_mkdir("bus/runway", 0); } break; - case mako: - if (NULL == proc_mckinley_root) - { - proc_mckinley_root = proc_mkdir("bus/mckinley", 0); - } - break; default: /* FIXME: this was added to prevent the compiler * complaining about missing pcx, pcxs and pcxt