summaryrefslogtreecommitdiffstats
path: root/arch/alpha/boot/misc.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@insightbb.com>2007-05-08 07:31:11 +0200
committerDmitry Torokhov <dtor@insightbb.com>2007-05-08 07:31:11 +0200
commit334d0dd8b660557608142f0f77abc6812b48f08b (patch)
tree9393a9aa099d7d42deda5f9f5054796c0c769be7 /arch/alpha/boot/misc.c
parentInput: aaed2000_kbd - convert to use polldev library (diff)
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
downloadlinux-334d0dd8b660557608142f0f77abc6812b48f08b.tar.xz
linux-334d0dd8b660557608142f0f77abc6812b48f08b.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/alpha/boot/misc.c')
-rw-r--r--arch/alpha/boot/misc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/boot/misc.c b/arch/alpha/boot/misc.c
index 1d65adf5691e..c00646b25f6e 100644
--- a/arch/alpha/boot/misc.c
+++ b/arch/alpha/boot/misc.c
@@ -98,7 +98,7 @@ extern int end;
static ulg free_mem_ptr;
static ulg free_mem_ptr_end;
-#define HEAP_SIZE 0x2000
+#define HEAP_SIZE 0x3000
#include "../../../lib/inflate.c"