Merge commit 'v2.6.30-rc5' into core/iommu

Merge reason: core/iommu was on an .30-rc1 base,
              update it to .30-rc5 to refresh.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 0 insertions, 38 deletions

diff --git a/include/asm-m32r/setup.h b/include/asm-m32r/setup.h
deleted file mode 100644
index c637ab992394..000000000000
--- a/include/asm-m32r/setup.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef _ASM_M32R_SETUP_H
-#define _ASM_M32R_SETUP_H
-
-/*
- * This is set up by the setup-routine at boot-time
- */
-
-#define COMMAND_LINE_SIZE       512
-
-#ifdef __KERNEL__
-
-#define PARAM                   ((unsigned char *)empty_zero_page)
-
-#define MOUNT_ROOT_RDONLY       (*(unsigned long *) (PARAM+0x000))
-#define RAMDISK_FLAGS           (*(unsigned long *) (PARAM+0x004))
-#define ORIG_ROOT_DEV           (*(unsigned long *) (PARAM+0x008))
-#define LOADER_TYPE             (*(unsigned long *) (PARAM+0x00c))
-#define INITRD_START            (*(unsigned long *) (PARAM+0x010))
-#define INITRD_SIZE             (*(unsigned long *) (PARAM+0x014))
-
-#define M32R_CPUCLK             (*(unsigned long *) (PARAM+0x018))
-#define M32R_BUSCLK             (*(unsigned long *) (PARAM+0x01c))
-#define M32R_TIMER_DIVIDE       (*(unsigned long *) (PARAM+0x020))
-
-#define COMMAND_LINE            ((char *) (PARAM+0x100))
-
-#define SCREEN_INFO             (*(struct screen_info *) (PARAM+0x200))
-
-#define RAMDISK_IMAGE_START_MASK        (0x07FF)
-#define RAMDISK_PROMPT_FLAG             (0x8000)
-#define RAMDISK_LOAD_FLAG               (0x4000)
-
-extern unsigned long memory_start;
-extern unsigned long memory_end;
-
-#endif  /*  __KERNEL__  */
-
-#endif /* _ASM_M32R_SETUP_H */