diff options
| author | Kay Sievers <kay@vrfy.org> | 2012-05-29 17:50:24 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2012-05-29 17:50:24 +0200 |
| commit | 916a358423f90a5ffeecda8ab6968b109b198fae (patch) | |
| tree | a66b3a232220e0452a4a7b02fdcd887405169521 | |
| parent | 3d21d9e2190fde998f1a48b28c3b90e1f5ba1551 (diff) | |
| download | patches-916a358423f90a5ffeecda8ab6968b109b198fae.tar.gz | |
remove Makefile hack
| -rw-r--r-- | kmsg_dump.patch | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/kmsg_dump.patch b/kmsg_dump.patch index 1a83a55..fc78875 100644 --- a/kmsg_dump.patch +++ b/kmsg_dump.patch @@ -1,12 +1,11 @@ --- arch/powerpc/platforms/pseries/nvram.c | 60 +--------- - arch/x86/platform/mrst/Makefile | 2 arch/x86/platform/mrst/early_printk_mrst.c | 13 -- drivers/mtd/mtdoops.c | 22 --- fs/pstore/platform.c | 34 ++--- include/linux/kmsg_dump.h | 39 +++++- kernel/printk.c | 173 ++++++++++++++++++++++++----- - 7 files changed, 205 insertions(+), 138 deletions(-) + 6 files changed, 204 insertions(+), 137 deletions(-) --- a/arch/powerpc/platforms/pseries/nvram.c +++ b/arch/powerpc/platforms/pseries/nvram.c @@ -108,13 +107,6 @@ err_type = ERR_TYPE_KERNEL_PANIC; *oops_len = (u16) text_len; } ---- a/arch/x86/platform/mrst/Makefile -+++ b/arch/x86/platform/mrst/Makefile -@@ -1,3 +1,3 @@ - obj-$(CONFIG_X86_INTEL_MID) += mrst.o - obj-$(CONFIG_X86_INTEL_MID) += vrtc.o --obj-$(CONFIG_EARLY_PRINTK_INTEL_MID) += early_printk_mrst.o -+obj-y += early_printk_mrst.o --- a/arch/x86/platform/mrst/early_printk_mrst.c +++ b/arch/x86/platform/mrst/early_printk_mrst.c @@ -110,19 +110,16 @@ static struct kmsg_dumper dw_dumper; |