X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-arm%2Farch-lh7a40x%2Fhardware.h;fp=include%2Fasm-arm%2Farch-lh7a40x%2Fhardware.h;h=aeb07c162e2594d1051d76c230d49751ca8b63b7;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=e9ff74fd79396a882c2889310dcc2ef939d2cbd2;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/include/asm-arm/arch-lh7a40x/hardware.h b/include/asm-arm/arch-lh7a40x/hardware.h
index e9ff74fd7..aeb07c162 100644
--- 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 */