Skip to content

Commit

Permalink
m68k: use mmu scatterlist.h for non-mmu setups as well
Browse files Browse the repository at this point in the history
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: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
  • Loading branch information
Greg Ungerer committed Mar 24, 2009
1 parent 54cae79 commit 375d1c7
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 49 deletions.
26 changes: 22 additions & 4 deletions arch/m68k/include/asm/scatterlist.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
#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) */
23 changes: 0 additions & 23 deletions arch/m68k/include/asm/scatterlist_mm.h

This file was deleted.

22 changes: 0 additions & 22 deletions arch/m68k/include/asm/scatterlist_no.h

This file was deleted.

0 comments on commit 375d1c7

Please sign in to comment.