linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-arm / arch-lh7a40x / hardware.h

diff --git a/include/asm-arm/arch-lh7a40x/hardware.h b/include/asm-arm/arch-lh7a40x/hardware.h
index e9ff74f..aeb07c1 100644 (file)
--- a/include/asm-arm/arch-lh7a40x/hardware.h
+++ b/include/asm-arm/arch-lh7a40x/hardware.h
@@ -13,8 +13,6 @@
 #ifndef __ASM_ARCH_HARDWARE_H
 #define __ASM_ARCH_HARDWARE_H
 
-#include <asm/sizes.h>         /* Added for the sake of amba-clcd driver */
-
 #define io_p2v(x) (0xf0000000 | (((x) & 0xfff00000) >> 4) | ((x) & 0x0000ffff))
 #define io_v2p(x) (             (((x) & 0x0fff0000) << 4) | ((x) & 0x0000ffff))
 
@@ -55,8 +53,6 @@ typedef struct { volatile u8 offset[4096]; } __regbase8;
 
 #endif
 
-#define MASK_AND_SET(v,m,s)    (v) = ((v)&~(m))|(s)
-
 #include "registers.h"
 
 #endif  /* _ASM_ARCH_HARDWARE_H */