From: vamsi <vamsineelam@gmail.com>
To: git@vger.kernel.org
Subject: How to merge the diff file in the git repositry
Date: Sun, 22 Apr 2012 18:38:52 -0700 (PDT) [thread overview]
Message-ID: <1335145132814-7490516.post@n2.nabble.com> (raw)
hii ,
i have a diff file.how to add these modifications to the git repositry
diff --git a/board/Maxim/maximasp_eek/board_init.S
b/board/Maxim/maximasp_eek/board_init.S
index ec57078..bd55877 100644
--- a/board/Maxim/maximasp_eek/board_init.S
+++ b/board/Maxim/maximasp_eek/board_init.S
@@ -13,7 +13,7 @@
#define ENABLE_DLL
#define GCR_SETUP /* Modify GCR register */
-#define GCR_UBP /* UCI bypass */
+#undef GCR_UBP /* UCI bypass */
#undef GCR_PBEN /* Enable pass bridge */
#undef GCR_PBFB /* Enable burst in pass bridge */
#undef GCR_ADK /* Use ADK bridge */
diff --git a/include/configs/maximasp-eek.h b/include/configs/maximasp-eek.h
index 897f4ab..c9e3965 100644
--- a/include/configs/maximasp-eek.h
+++ b/include/configs/maximasp-eek.h
@@ -23,13 +23,13 @@
#define __CONFIG_H
#define CONFIG_SYS_USE_DDR /* Use DDR instead of PSRAM */
-#define CONFIG_SYS_SYNC_MEM /* Synchronous memory */
+//#define CONFIG_SYS_SYNC_MEM /* Synchronous memory */
/*
* CPU Clock - 16x crystal (20 MHz -> 320 MHz, 24 MHz -> 384 MHz)
*/
-//#define CONFIG_SYS_CPU_CLOCK 384000000
-#define CONFIG_SYS_CPU_CLOCK 320000000
+#define CONFIG_SYS_CPU_CLOCK 384000000
+//#define CONFIG_SYS_CPU_CLOCK 320000000
/*
* Physical Memory Map
regards
Git newbie
--
View this message in context: http://git.661346.n2.nabble.com/How-to-merge-the-diff-file-in-the-git-repositry-tp7490516p7490516.html
Sent from the git mailing list archive at Nabble.com.
next reply other threads:[~2012-04-23 1:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-23 1:38 vamsi [this message]
2012-04-24 2:25 ` How to merge the diff file in the git repositry Neal Kreitzinger
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=1335145132814-7490516.post@n2.nabble.com \
--to=vamsineelam@gmail.com \
--cc=git@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;
as well as URLs for NNTP newsgroup(s).