diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:56 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:56 +0200 |
commit | 8a11a59b379b641423a6ed655aae36ec00404403 (patch) | |
tree | a10f059d0bdcf9ba043cef744d605f9260991b18 /include/param.h | |
parent | e3ff4dfa41b4e8afc26b69e5c3d8c127f0f37c39 (diff) | |
parent | 9183a8c683014f7f6dae004009556c9c0d4d2a15 (diff) | |
download | barebox-8a11a59b379b641423a6ed655aae36ec00404403.tar.gz barebox-8a11a59b379b641423a6ed655aae36ec00404403.tar.xz |
Merge branch 'for-next/efi'
Conflicts:
.gitignore
Makefile
drivers/serial/Makefile
Diffstat (limited to 'include/param.h')
-rw-r--r-- | include/param.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/param.h b/include/param.h index 24827c5e78..8f200df847 100644 --- a/include/param.h +++ b/include/param.h @@ -7,7 +7,7 @@ #define PARAM_FLAG_RO (1 << 0) struct device_d; -typedef unsigned long IPaddr_t; +typedef uint32_t IPaddr_t; struct param_d { const char* (*get)(struct device_d *, struct param_d *param); |