diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-04 15:48:43 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-04 15:48:43 +0100 |
| commit | 1b575024f67f43a3b325c1d3f021ac482b6fad81 (patch) | |
| tree | fb36c110a86fd4d7517e107048b6c337aef7760d /scripts/bareboxenv.c | |
| parent | ec2bfe6953c14a477eef546858ab139012c7c695 (diff) | |
| parent | ab5418b570b24f5be1ac12c3804f6bf04ec48ad2 (diff) | |
| download | barebox-1b575024f67f43a3b325c1d3f021ac482b6fad81.tar.gz barebox-1b575024f67f43a3b325c1d3f021ac482b6fad81.tar.xz | |
Merge branch 'for-next/at91'
Conflicts:
arch/arm/boards/at91rm9200ek/init.c
arch/arm/boards/pm9263/init.c
arch/arm/configs/at91sam9n12ek_defconfig
arch/arm/mach-at91/Kconfig
Diffstat (limited to 'scripts/bareboxenv.c')
| -rw-r--r-- | scripts/bareboxenv.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/bareboxenv.c b/scripts/bareboxenv.c index 707d63dd81..9284c0b083 100644 --- a/scripts/bareboxenv.c +++ b/scripts/bareboxenv.c @@ -118,7 +118,6 @@ char *concat_subpath_file(const char *path, const char *f) #include "../include/envfs.h" #include "../crypto/crc32.c" #include "../lib/make_directory.c" -#include "../include/environment.h" #include "../common/environment.c" void usage(char *prgname) |