diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-04 17:27:06 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-04 17:27:06 +0200 |
| commit | efa4d684d8927428d333f841e37adeedcfe61cfb (patch) | |
| tree | 5c780a94fdfa9557da018a485d7fe884244aaf48 /common | |
| parent | 45d593bc5ec78e26e3a967517ed7a51f27c8b91f (diff) | |
| parent | 10d63913999fbd5c02a2a8daecf877c24663bdca (diff) | |
| download | barebox-efa4d684d8927428d333f841e37adeedcfe61cfb.tar.gz barebox-efa4d684d8927428d333f841e37adeedcfe61cfb.tar.xz | |
Merge branch 'for-next/misc'
Conflicts:
arch/arm/boards/chumby_falconwing/falconwing.c
arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
arch/x86/mach-x86.dox
scripts/setupmbr/setupmbr.c
Diffstat (limited to 'common')
| -rw-r--r-- | common/resource.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/resource.c b/common/resource.c index fe4680e3bd..1ea2a7522a 100644 --- a/common/resource.c +++ b/common/resource.c @@ -71,7 +71,7 @@ struct resource *__request_region(struct resource *parent, goto ok; if (start > r->end) continue; - debug("%s: 0x%08llx:0x%08llx conflicts with 0x%08llx:0x%08llx\n", + pr_warn("%s: 0x%08llx:0x%08llx conflicts with 0x%08llx:0x%08llx\n", __func__, (unsigned long long)start, (unsigned long long)end, |