diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-01-06 14:53:08 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-01-06 14:53:08 +0000 |
| commit | bbf56e650f301694d33650c6be03a49711c850f0 (patch) | |
| tree | 34f2e2c8b1b821fc44d06c5b3896e7418b4ec2d1 /scripts/ptx-modifications | |
| parent | f0d559b0ee86cea2dc6dc2cd56a52b938847f592 (diff) | |
| download | ptxdist-bbf56e650f301694d33650c6be03a49711c850f0.tar.gz ptxdist-bbf56e650f301694d33650c6be03a49711c850f0.tar.xz | |
* ptx-modifications/linux-2.6.git-48874077ddd6c0c444758059af2cf77c10204ece.diff:
reverse patch, quilt doesn't seem to like it very mutch
* ptx-modifications/confdata.c.diff:
deleted, obsolete
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9439 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'scripts/ptx-modifications')
| -rw-r--r-- | scripts/ptx-modifications/confdata.c.diff | 22 | ||||
| -rw-r--r-- | scripts/ptx-modifications/linux-2.6.git-48874077ddd6c0c444758059af2cf77c10204ece.diff | 30 | ||||
| -rw-r--r-- | scripts/ptx-modifications/series | 5 |
3 files changed, 19 insertions, 38 deletions
diff --git a/scripts/ptx-modifications/confdata.c.diff b/scripts/ptx-modifications/confdata.c.diff deleted file mode 100644 index 3a4015250..000000000 --- a/scripts/ptx-modifications/confdata.c.diff +++ /dev/null @@ -1,22 +0,0 @@ -kconfig patch: confdata.c -------------------------- - -This patch removes the timestamp from ptxconfig files, -which makes svn management of ptxdist projects a bit -cleaner - -bbu, 20071019 - ------------------------------------------------------------------------------- - ---- a/scripts/kconfig/confdata.c 2009-01-06 11:58:02.000000000 +0100 -+++ b/scripts/kconfig/confdata.c 2009-01-06 11:58:12.000000000 +0100 -@@ -399,7 +399,7 @@ - int type, l; - const char *str; - time_t now; -- int use_timestamp = 1; -+ int use_timestamp = 0; - char *env; - - dirname[0] = 0; diff --git a/scripts/ptx-modifications/linux-2.6.git-48874077ddd6c0c444758059af2cf77c10204ece.diff b/scripts/ptx-modifications/linux-2.6.git-48874077ddd6c0c444758059af2cf77c10204ece.diff index 37c732982..1eac04973 100644 --- a/scripts/ptx-modifications/linux-2.6.git-48874077ddd6c0c444758059af2cf77c10204ece.diff +++ b/scripts/ptx-modifications/linux-2.6.git-48874077ddd6c0c444758059af2cf77c10204ece.diff @@ -14,22 +14,26 @@ Cc: MatÄj Laitl <strohel@gmail.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> --- -diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c -index bc5854e..2ee12a7 100644 ---- a/scripts/kconfig/mconf.c -+++ b/scripts/kconfig/mconf.c -@@ -481,6 +481,14 @@ static void build_conf(struct menu *menu) +--- + scripts/kconfig/mconf.c | 8 -------- + 1 file changed, 8 deletions(-) + +Index: ptxdist-trunk/scripts/kconfig/mconf.c +=================================================================== +--- ptxdist-trunk.orig/scripts/kconfig/mconf.c ++++ ptxdist-trunk/scripts/kconfig/mconf.c +@@ -439,14 +439,6 @@ static void build_conf(struct menu *menu if (single_menu_mode && menu->data) goto conf_childs; return; -+ case P_COMMENT: -+ if (prompt) { -+ child_count++; -+ item_make(" %*c*** %s ***", indent + 1, ' ', _(prompt)); -+ item_set_tag(':'); -+ item_set_data(menu); -+ } -+ break; +- case P_COMMENT: +- if (prompt) { +- child_count++; +- item_make(" %*c*** %s ***", indent + 1, ' ', _(prompt)); +- item_set_tag(':'); +- item_set_data(menu); +- } +- break; default: if (prompt) { child_count++; diff --git a/scripts/ptx-modifications/series b/scripts/ptx-modifications/series index 94263a898..fe784d664 100644 --- a/scripts/ptx-modifications/series +++ b/scripts/ptx-modifications/series @@ -1,6 +1,5 @@ # This patchset changes the official kconfig (see $LINUXSRC/scripts/kconfig for # details) to work with ptxdist. The sources included in this tree already have # this patches applied. -kconfig-2.6.28-ptx1.diff -p1 -confdata.c.diff -p1 -linux-2.6.git-48874077ddd6c0c444758059af2cf77c10204ece.diff -p1 -R +kconfig-2.6.28-ptx1.diff +linux-2.6.git-48874077ddd6c0c444758059af2cf77c10204ece.diff |