diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:00:25 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:00:25 +0200 |
| commit | 33c56e21eb3bf841c79d9c8a40dedc8b16b774f2 (patch) | |
| tree | fc0e871d5fc9020e0c4bb01ef0a5cf4ece6060a1 /include | |
| parent | d32008b2797a7c1bb13ec0cb3273de2dfcc97d02 (diff) | |
| parent | ce8f489122e8390360e87c84888aacfc87743a83 (diff) | |
| download | barebox-33c56e21eb3bf841c79d9c8a40dedc8b16b774f2.tar.gz barebox-33c56e21eb3bf841c79d9c8a40dedc8b16b774f2.tar.xz | |
Merge branch 'for-next/misc'
Conflicts:
commands/Makefile
Diffstat (limited to 'include')
| -rw-r--r-- | include/shell.h | 12 | ||||
| -rw-r--r-- | include/usb/usb.h | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/include/shell.h b/include/shell.h new file mode 100644 index 0000000000..b98cac3dc5 --- /dev/null +++ b/include/shell.h @@ -0,0 +1,12 @@ +/* + * (C) Copyright 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + * + * Under GPLv2 only + */ + +#ifndef __SHELL_H__ +#define __SHELL_H__ + +int shell_get_last_return_code(void); + +#endif /* __SHELL_H__ */ diff --git a/include/usb/usb.h b/include/usb/usb.h index 95fb6f3a3b..821724e544 100644 --- a/include/usb/usb.h +++ b/include/usb/usb.h @@ -210,6 +210,7 @@ struct usb_host { struct list_head list; + struct device_d *hw_dev; int busnum; int scanned; }; |