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

Commit 3084f0c6 authored by Jeff Garzik's avatar Jeff Garzik Committed by Jens Axboe
Browse files

drivers/block/umem: move private include away from include/linux 



Move include/linux/umem.h to drivers/block, as umem.c is the only user,
and its not an exported header.

Move the PCI_{VENDOR,DEVICE}_ID_* constants to include/linux/pci_ids.h.

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent ed155a95

drivers/block/umem.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
#include <linux/fcntl.h>        /* O_ACCMODE */

#include <linux/hdreg.h>  /* HDIO_GETGEO */



#include <linux/umem.h>

#include "umem.h"



#include <asm/uaccess.h>

#include <asm/io.h>

include/linux/umem.h→drivers/block/umem.h

+0 −5
Original line number Diff line number Diff line
@@ -125,11 +125,6 @@ struct mm_dma_desc { 
	__le64	sem_control_bits;

} __attribute__((aligned(8)));



#define PCI_VENDOR_ID_MICRO_MEMORY		0x1332

#define PCI_DEVICE_ID_MICRO_MEMORY_5415CN	0x5415

#define PCI_DEVICE_ID_MICRO_MEMORY_5425CN	0x5425

#define PCI_DEVICE_ID_MICRO_MEMORY_6155		0x6155



/* bits for card->flags */

#define UM_FLAG_DMA_IN_REGS		1

#define UM_FLAG_NO_BYTE_STATUS		2

include/linux/pci_ids.h

+5 −0
Original line number Diff line number Diff line
@@ -1736,6 +1736,11 @@ 


#define PCI_VENDOR_ID_RADISYS		0x1331



#define PCI_VENDOR_ID_MICRO_MEMORY		0x1332

#define PCI_DEVICE_ID_MICRO_MEMORY_5415CN	0x5415

#define PCI_DEVICE_ID_MICRO_MEMORY_5425CN	0x5425

#define PCI_DEVICE_ID_MICRO_MEMORY_6155		0x6155



#define PCI_VENDOR_ID_DOMEX		0x134a

#define PCI_DEVICE_ID_DOMEX_DMX3191D	0x0001