diff for duplicates of <20100729085014.GT26313@bicker> diff --git a/a/1.txt b/N1/1.txt index e1364a8..1d753e9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,9 +12,10 @@ index c64a1bc..090b3ec 100644 +++ b/drivers/char/tpm/tpm_atmel.c @@ -205,7 +205,7 @@ static int __init init_atmel(void) - have_region (atmel_request_region -- (tpm_atmel.base, region_size, "tpm_atmel0") = NULL) ? 0 : 1; -+ (base, region_size, "tpm_atmel0") = NULL) ? 0 : 1; + have_region = + (atmel_request_region +- (tpm_atmel.base, region_size, "tpm_atmel0") == NULL) ? 0 : 1; ++ (base, region_size, "tpm_atmel0") == NULL) ? 0 : 1; pdev = platform_device_register_simple("tpm_atmel", -1, NULL, 0); if (IS_ERR(pdev)) { diff --git a/a/content_digest b/N1/content_digest index 03495c1..27117ae 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <error27@gmail.com>\0" "Subject\0[patch] tmp_atmel: request correct region\0" - "Date\0Thu, 29 Jul 2010 08:50:14 +0000\0" + "Date\0Thu, 29 Jul 2010 10:50:14 +0200\0" "To\0Debora Velarde <debora@linux.vnet.ibm.com>\0" "Cc\0Rajiv Andrade <srajiv@linux.vnet.ibm.com>" Marcel Selhorst <m.selhorst@sirrix.com> @@ -23,11 +23,12 @@ "+++ b/drivers/char/tpm/tpm_atmel.c\n" "@@ -205,7 +205,7 @@ static int __init init_atmel(void)\n" " \n" - " \thave_region \t (atmel_request_region\n" - "-\t (tpm_atmel.base, region_size, \"tpm_atmel0\") = NULL) ? 0 : 1;\n" - "+\t (base, region_size, \"tpm_atmel0\") = NULL) ? 0 : 1;\n" + " \thave_region =\n" + " \t (atmel_request_region\n" + "-\t (tpm_atmel.base, region_size, \"tpm_atmel0\") == NULL) ? 0 : 1;\n" + "+\t (base, region_size, \"tpm_atmel0\") == NULL) ? 0 : 1;\n" " \n" " \tpdev = platform_device_register_simple(\"tpm_atmel\", -1, NULL, 0);\n" " \tif (IS_ERR(pdev)) {" -c7731736ebdf369fd99a0ab2438f6c084c9d49bfaf4cc712b13fa50d0e2f482a +2d3e85a8d83596466c8a4899ce60d76ea7a3013a9fd66fe8c85d0da467078056
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.