Commit 2a0fd0a9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: pxa: stop using mach/bitfield.h 



There are two identical copies of mach/bitfield.h, one for
mach-sa1100 and one for mach-pxa. The pxafb driver only
makes use of two macros, which can be trivially open-coded
in the header.

Cc: dri-devel@lists.freedesktop.org
Acked-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 08d3df8c

arch/arm/mach-pxa/idp.c

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include "pxa25x.h"

#include "idp.h"

#include <linux/platform_data/video-pxafb.h>

#include <mach/bitfield.h>

#include <linux/platform_data/mmc-pxamci.h>

#include <linux/smc91x.h>

arch/arm/mach-pxa/include/mach/regs-lcd.h

+3 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
#ifndef __ASM_ARCH_REGS_LCD_H

#define __ASM_ARCH_REGS_LCD_H



#include <mach/bitfield.h>



/*

 * LCD Controller Registers and Bits Definitions

 */
@@ -86,6 +84,9 @@ 
#define LCCR0_OUC	(1 << 25)	/* Overlay Underlay control bit */

#define LCCR0_LDDALT	(1 << 26)	/* LDD alternate mapping control */



#define Fld(Size, Shft)	(((Size) << 16) + (Shft))

#define FShft(Field)	((Field) & 0x0000FFFF)



#define LCCR1_PPL	Fld (10, 0)	/* Pixels Per Line - 1 */

#define LCCR1_DisWdth(Pixel)	(((Pixel) - 1) << FShft (LCCR1_PPL))

arch/arm/mach-pxa/regs-u2d.h

+0 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
#ifndef __ASM_ARCH_PXA3xx_U2D_H

#define __ASM_ARCH_PXA3xx_U2D_H



#include <mach/bitfield.h>



/*

 * USB2 device controller registers and bits definitions

 */

drivers/video/fbdev/pxafb.c

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ 
#include <asm/io.h>

#include <asm/irq.h>

#include <asm/div64.h>

#include <mach/bitfield.h>

#include <linux/platform_data/video-pxafb.h>



/*