From c7de829c796978e519984df2f1c8cfcf921a39a4 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Tue, 19 Nov 2002 11:04:11 +0000
Subject: * 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.
---
 common/hush.c | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'common/hush.c')

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__
-- 
cgit v1.1