diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-04-04 10:06:14 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-04-04 10:06:14 +0200 |
commit | a5a82ca2cd84d3a730025bed7414b35f041750b6 (patch) | |
tree | 94a5179267528e714dc6f2c0e8bc68343deab88f /include | |
parent | b587c87aacbc9b6fe859cef97ca43dc353f8a44f (diff) | |
parent | 6979118edef2b57c3bb6f401b58a03ab6bb5a54e (diff) | |
download | barebox-a5a82ca2cd84d3a730025bed7414b35f041750b6.tar.gz barebox-a5a82ca2cd84d3a730025bed7414b35f041750b6.tar.xz |
Merge branch 'for-next/boot'
Diffstat (limited to 'include')
-rw-r--r-- | include/blspec.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/blspec.h b/include/blspec.h index 66d2e8485d..afac5ed7ba 100644 --- a/include/blspec.h +++ b/include/blspec.h @@ -35,7 +35,6 @@ int blspec_boot_devicename(const char *devname, int verbose, int dryrun); int blspec_scan_devices(struct blspec *blspec); -struct blspec_entry *blspec_entry_default(struct blspec *l); int blspec_scan_devicename(struct blspec *blspec, const char *devname); int blspec_scan_directory(struct blspec *blspec, const char *root); @@ -91,4 +90,13 @@ static inline void blspec_free(struct blspec *blspec) free(blspec); } +#ifdef CONFIG_BLSPEC +struct blspec_entry *blspec_entry_default(struct blspec *l); +#else +static inline struct blspec_entry *blspec_entry_default(struct blspec *l) +{ + return NULL; +} +#endif + #endif /* __LOADER_H__ */ |