diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-20 09:49:41 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-20 09:49:41 +0900 |
| commit | cea35899a02226b70baeee7e179d7a7c6e814b98 (patch) | |
| tree | 19621a7ae67df5f398071791d52489a464b1b30a /arch/powerpc/boot/ops.h | |
| parent | 53971a86d2db89f32859dc26bd6594b5bc665d5b (diff) | |
| parent | d6d211db37e75de2ddc3a4f979038c40df7cc79c (diff) | |
| download | linux-cea35899a02226b70baeee7e179d7a7c6e814b98.tar.gz linux-cea35899a02226b70baeee7e179d7a7c6e814b98.tar.xz | |
Merge 3.15-rc5 into usb-next
We need these USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc/boot/ops.h')
| -rw-r--r-- | arch/powerpc/boot/ops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/ops.h b/arch/powerpc/boot/ops.h index b3218ce451bb..8aad3c55aeda 100644 --- a/arch/powerpc/boot/ops.h +++ b/arch/powerpc/boot/ops.h @@ -15,7 +15,7 @@ #include "types.h" #include "string.h" -#define COMMAND_LINE_SIZE 512 +#define BOOT_COMMAND_LINE_SIZE 2048 #define MAX_PATH_LEN 256 #define MAX_PROP_LEN 256 /* What should this be? */ |