Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 375d1c7e authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68k: use mmu scatterlist.h for non-mmu setups as well 



There is only trivial differences between the non-mmu and mmu
versions of scatterlist.h. So use the mmu one and remove the non-mmu one.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 54cae79e

arch/m68k/include/asm/scatterlist.h

+22 −4
Original line number Diff line number Diff line 
#ifdef __uClinux__

#include "scatterlist_no.h"

#else

#include "scatterlist_mm.h"

#ifndef _M68K_SCATTERLIST_H

#define _M68K_SCATTERLIST_H



#include <linux/types.h>



struct scatterlist {

#ifdef CONFIG_DEBUG_SG

	unsigned long sg_magic;

#endif

	unsigned long page_link;

	unsigned int offset;

	unsigned int length;



	__u32 dma_address;	/* A place to hang host-specific addresses at. */

};



/* This is bogus and should go away. */

#define ISA_DMA_THRESHOLD (0x00ffffff)



#define sg_dma_address(sg)	((sg)->dma_address)

#define sg_dma_len(sg)		((sg)->length)



#endif /* !(_M68K_SCATTERLIST_H) */

arch/m68k/include/asm/scatterlist_mm.h

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
#ifndef _M68K_SCATTERLIST_H

#define _M68K_SCATTERLIST_H



#include <linux/types.h>



struct scatterlist {

#ifdef CONFIG_DEBUG_SG

	unsigned long sg_magic;

#endif

	unsigned long page_link;

	unsigned int offset;

	unsigned int length;



	__u32 dma_address;	/* A place to hang host-specific addresses at. */

};



/* This is bogus and should go away. */

#define ISA_DMA_THRESHOLD (0x00ffffff)



#define sg_dma_address(sg)	((sg)->dma_address)

#define sg_dma_len(sg)		((sg)->length)



#endif /* !(_M68K_SCATTERLIST_H) */

arch/m68k/include/asm/scatterlist_no.h

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
#ifndef _M68KNOMMU_SCATTERLIST_H

#define _M68KNOMMU_SCATTERLIST_H



#include <linux/mm.h>

#include <asm/types.h>



struct scatterlist {

#ifdef CONFIG_DEBUG_SG

	unsigned long	sg_magic;

#endif

	unsigned long	page_link;

	unsigned int	offset;

	dma_addr_t	dma_address;

	unsigned int	length;

};



#define sg_dma_address(sg)      ((sg)->dma_address)

#define sg_dma_len(sg)          ((sg)->length)



#define ISA_DMA_THRESHOLD	(0xffffffff)



#endif /* !(_M68KNOMMU_SCATTERLIST_H) */