diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-11-09 10:55:04 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-11-09 10:55:04 +0100 |
commit | b2cc1d18f57f8af42347a4b7a05afcc7e3e6d66d (patch) | |
tree | c7bf18bd3f6eef491dd62d383f836e4536c811cb /include | |
parent | ac9c1beb361e3c71e0b9b59d38e5022f12c263c6 (diff) | |
parent | 459bf1fd31da2c091c6c1e3a7e0f6a1b1cbf588b (diff) | |
download | barebox-b2cc1d18f57f8af42347a4b7a05afcc7e3e6d66d.tar.gz barebox-b2cc1d18f57f8af42347a4b7a05afcc7e3e6d66d.tar.xz |
Merge branch 'for-next/misc'
Diffstat (limited to 'include')
-rw-r--r-- | include/dhcp.h | 1 | ||||
-rw-r--r-- | include/i2c/i2c.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/dhcp.h b/include/dhcp.h index ce5ed61c65..0dced8e9fa 100644 --- a/include/dhcp.h +++ b/include/dhcp.h @@ -28,6 +28,7 @@ struct dhcp_result { IPaddr_t gateway; IPaddr_t nameserver; IPaddr_t serverip; + IPaddr_t dhcp_serverip; char *hostname; char *domainname; char *rootpath; diff --git a/include/i2c/i2c.h b/include/i2c/i2c.h index cf784ca1f1..17b507ca22 100644 --- a/include/i2c/i2c.h +++ b/include/i2c/i2c.h @@ -17,6 +17,7 @@ #define I2C_I2C_H #include <driver.h> +#include <init.h> #include <linux/types.h> struct i2c_adapter; @@ -297,4 +298,7 @@ static inline int i2c_driver_register(struct driver_d *drv) return register_driver(drv); } +#define device_i2c_driver(drv) \ + register_driver_macro(device, i2c, drv) + #endif /* I2C_I2C_H */ |