diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-09-10 13:29:39 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-09-10 13:29:39 -0700 |
| commit | 962393f1adefe4b3be8f63409342e0ab34a5b162 (patch) | |
| tree | 2dd2477f992dc60204fa1104eea9beca5e6f9596 /drivers/of/fdt.c | |
| parent | 070565aed13c16e108f35bcedb8ad22782683735 (diff) | |
| parent | ceec4d230630127c478f33ae4c81ad7992a5de78 (diff) | |
Merge branch 'linaro-android-3.18-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v3.18-androidlsk-v3.18-15.09-android
* 'linaro-android-3.18-lsk' of git://android.git.linaro.org/kernel/linaro-android:
net: sysctl_net_core: delete unused variable
usb: gadget: configfs: fix unused variable warnings
net: PPPoPNS: Remove length argument from data_ready
usb: gadget: function: fix unused function warnings
android: configs: base: enable Android gadget functions
usb: gadget: audio_source function depends on SND_PCM
tcp: Silence warning: ‘in’ may be used uninitialized
drivers/base: cpu: fix CPU_AUTOPROBE
of/fdt: fix build warnings in early_init_dt_scan_chosen()
Diffstat (limited to 'drivers/of/fdt.c')
| -rw-r--r-- | drivers/of/fdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index af3b78382d4a..821f6b591ce2 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -911,8 +911,8 @@ static const char *config_cmdline = ""; int __init early_init_dt_scan_chosen(unsigned long node, const char *uname, int depth, void *data) { - unsigned long l = 0; - char *p = NULL; + int l = 0; + const char *p = NULL; char *cmdline = data; pr_debug("search \"chosen\", depth: %d, uname: %s\n", depth, uname); |