| commit | 81a15f2ee56fe725ce68e3cdad982117e261d47d | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Wed Sep 19 17:32:12 2012 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Wed Sep 19 17:32:12 2012 +0200 |
| tree | 930188dd285b2c2b8c0625849d24bf68ed1f0ca0 | |
| parent | 0570a365a6b8ccbfe7baa459de2b7396ddf2de90 [diff] | |
| parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 [diff] |
Merge tag 'v3.6-rc6' into x86/cleanups Merge Linux v3.6-rc6 before applying more cleanups. Signed-off-by: Ingo Molnar <mingo@kernel.org>
diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S index b4e15dd..2a01744 100644 --- a/arch/x86/boot/header.S +++ b/arch/x86/boot/header.S
@@ -32,10 +32,6 @@ #define SVGA_MODE ASK_VGA #endif -#ifndef RAMDISK -#define RAMDISK 0 -#endif - #ifndef ROOT_RDONLY #define ROOT_RDONLY 1 #endif