diff options
author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-06-12 17:02:03 +0200 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-06-12 17:02:03 +0200 |
commit | 82681a318f9f028ea64e61f24bbd9ac535531921 (patch) | |
tree | 529b6a5b4fd040fb54b7672b1a224ebd47445876 /tools/perf/util/environment.c | |
parent | [SCSI] osd: Remove out-of-tree left overs (diff) | |
parent | block: fix kernel-doc in recent block/ changes (diff) | |
download | linux-82681a318f9f028ea64e61f24bbd9ac535531921.tar.xz linux-82681a318f9f028ea64e61f24bbd9ac535531921.zip |
[SCSI] Merge branch 'linus'
Conflicts:
drivers/message/fusion/mptsas.c
fixed up conflict between req->data_len accessors and mptsas driver updates.
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'tools/perf/util/environment.c')
-rw-r--r-- | tools/perf/util/environment.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/perf/util/environment.c b/tools/perf/util/environment.c new file mode 100644 index 000000000000..275b0ee345f5 --- /dev/null +++ b/tools/perf/util/environment.c @@ -0,0 +1,9 @@ +/* + * We put all the perf config variables in this same object + * file, so that programs can link against the config parser + * without having to link against all the rest of perf. + */ +#include "cache.h" + +const char *pager_program; +int pager_use_color = 1; |