diff --git a/[refs] b/[refs] index d21a6a7d7006..283bdb03bd07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb68d4be95fef4aab82c2a97da93a898d532dd57 +refs/heads/master: db7f4e3d2b0a68eafc16a7b78ac0b7566db1e799 diff --git a/trunk/scripts/dtc/dtc.c b/trunk/scripts/dtc/dtc.c index 451c92d31b19..2ef5e2e3dd38 100644 --- a/trunk/scripts/dtc/dtc.c +++ b/trunk/scripts/dtc/dtc.c @@ -101,7 +101,7 @@ int main(int argc, char *argv[]) const char *outform = "dts"; const char *outname = "-"; const char *depname = NULL; - int force = 0, check = 0, sort = 0; + int force = 0, sort = 0; const char *arg; int opt; FILE *outf = NULL; @@ -143,9 +143,6 @@ int main(int argc, char *argv[]) case 'f': force = 1; break; - case 'c': - check = 1; - break; case 'q': quiet++; break; diff --git a/trunk/scripts/dtc/flattree.c b/trunk/scripts/dtc/flattree.c index ead0332c87e1..28d0b2381df6 100644 --- a/trunk/scripts/dtc/flattree.c +++ b/trunk/scripts/dtc/flattree.c @@ -697,7 +697,6 @@ static struct reserve_info *flat_read_mem_reserve(struct inbuf *inb) { struct reserve_info *reservelist = NULL; struct reserve_info *new; - const char *p; struct fdt_reserve_entry re; /* @@ -706,7 +705,6 @@ static struct reserve_info *flat_read_mem_reserve(struct inbuf *inb) * * First pass, count entries. */ - p = inb->ptr; while (1) { flat_read_chunk(inb, &re, sizeof(re)); re.address = fdt64_to_cpu(re.address);