mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Tracey Dent <tdent48227@gmail.com>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org, blogic@openwrt.org,
	Tracey Dent <tdent48227@gmail.com>
Subject: [PATCH 1/1] Arch: mips: Delete Makefile.rej
Date: Wed, 12 Sep 2012 18:50:39 -0400	[thread overview]
Message-ID: <1347490239-1351-1-git-send-email-tdent48227@gmail.com> (raw)

Makefile.rej should not be there. That was introduced
in commit 3fa68afc3d774bab1e91cbb3a3cdd1e36068ee95 .

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
 arch/mips/lantiq/xway/Makefile.rej |    5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 arch/mips/lantiq/xway/Makefile.rej

diff --git a/arch/mips/lantiq/xway/Makefile.rej b/arch/mips/lantiq/xway/Makefile.rej
deleted file mode 100644
index 8066520..0000000
--- a/arch/mips/lantiq/xway/Makefile.rej
+++ /dev/null
@@ -1,5 +0,0 @@
---- arch/mips/lantiq/xway/Makefile
-+++ arch/mips/lantiq/xway/Makefile
-@@ -1 +1 @@
--obj-y := prom.o sysctrl.o clk.o reset.o gpio.o dma.o
-+obj-y := prom.o sysctrl.o clk.o reset.o dma.o
-- 
1.7.10.rc4


             reply	other threads:[~2012-09-12 22:50 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-12 22:50 Tracey Dent [this message]
2012-09-12 23:15 ` richard -rw- weinberger
2012-09-13  8:24   ` John Crispin
2012-09-16  3:34     ` Tracey Dent

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1347490239-1351-1-git-send-email-tdent48227@gmail.com \
    --to=tdent48227@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=blogic@openwrt.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®