summaryrefslogtreecommitdiff
path: root/common/hush.c
diff options
context:
space:
mode:
authorwdenk <wdenk>2002-11-19 11:04:11 +0000
committerwdenk <wdenk>2002-11-19 11:04:11 +0000
commitc7de829c796978e519984df2f1c8cfcf921a39a4 (patch)
tree43e42aa9a09f5265783c1622a5cea080471ef50e /common/hush.c
parent2262cfeef91458b01a1bfe3812ccbbfdf8b82807 (diff)
downloadu-boot-imx-c7de829c796978e519984df2f1c8cfcf921a39a4.zip
u-boot-imx-c7de829c796978e519984df2f1c8cfcf921a39a4.tar.gz
u-boot-imx-c7de829c796978e519984df2f1c8cfcf921a39a4.tar.bz2
* Patch by Thomas Frieden, 13 Nov 2002:
Add code for AmigaOne board (preliminary merge to U-Boot, still WIP) * Patch by Jon Diekema, 12 Nov 2002: - Adding URL for IEEE OUI lookup - Making the autoboot #defines dependent on CONFIG_AUTOBOOT_KEYED being defined. - In the CONFIG_EXTRA_ENV_SETTINGS #define, the root-on-initrd and root-on-nfs macros are designed to switch how the default boot method gets defined.
Diffstat (limited to 'common/hush.c')
-rw-r--r--common/hush.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/common/hush.c b/common/hush.c
index 3cb6fc3..92547433 100644
--- a/common/hush.c
+++ b/common/hush.c
@@ -356,11 +356,6 @@ struct built_in_command {
};
#endif
-/* belongs in busybox.h */
-static inline int max(int a, int b) {
- return (a>b)?a:b;
-}
-
/* This should be in utility.c */
#ifdef DEBUG_SHELL
#ifndef __U_BOOT__