vserver 1.9.3

[linux-2.6.git] / include / asm-arm / arch-versatile / uncompress.h

diff --git a/include/asm-arm/arch-versatile/uncompress.h b/include/asm-arm/arch-versatile/uncompress.h
index 148ad37..2f57499 100644 (file)
--- a/include/asm-arm/arch-versatile/uncompress.h
+++ b/include/asm-arm/arch-versatile/uncompress.h
@@ -17,8 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include <linux/kernel.h>
-
 #define AMBA_UART_DR   (*(volatile unsigned char *)0x101F1000)
 #define AMBA_UART_LCRH (*(volatile unsigned char *)0x101F102C)
 #define AMBA_UART_CR   (*(volatile unsigned char *)0x101F1030)
@@ -27,7 +25,7 @@
 /*
  * This does not append a newline
  */
-static void puts(const char *s)
+static void putstr(const char *s)
 {
        while (*s) {
                while (AMBA_UART_FR & (1 << 5))