diff options
author | 2010-12-13 09:28:43 +0100 | |
---|---|---|
committer | 2010-12-13 09:28:43 +0100 | |
commit | 20aeeb356ba2e8daa99b5942c528ae2b3ea28433 (patch) | |
tree | d2cebc7039954851998d592123899f5627def7a9 /arch/arm/mach-footbridge/include/mach/vmalloc.h | |
parent | Merge branch 'for-2.6.37' into for-2.6.38 (diff) | |
parent | sound: don't use flush_scheduled_work() (diff) | |
download | linux-dev-20aeeb356ba2e8daa99b5942c528ae2b3ea28433.tar.xz linux-dev-20aeeb356ba2e8daa99b5942c528ae2b3ea28433.zip |
Merge branch 'topic/workq-update' into topic/asoc
Conflicts:
sound/soc/codecs/wm8350.c
sound/soc/codecs/wm8753.c
sound/soc/sh/fsi.c
sound/soc/soc-core.c
Diffstat (limited to 'arch/arm/mach-footbridge/include/mach/vmalloc.h')
-rw-r--r-- | arch/arm/mach-footbridge/include/mach/vmalloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-footbridge/include/mach/vmalloc.h b/arch/arm/mach-footbridge/include/mach/vmalloc.h index 0ffbb7c85e59..40ba78e5782b 100644 --- a/arch/arm/mach-footbridge/include/mach/vmalloc.h +++ b/arch/arm/mach-footbridge/include/mach/vmalloc.h @@ -7,4 +7,4 @@ */ -#define VMALLOC_END 0xf0000000 +#define VMALLOC_END 0xf0000000UL |