From 7e15f695fafb13f38ff401e8ba04bd96eac313e3 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Thu, 27 Sep 2007 06:25:06 -0400 Subject: [PATCH] --- yaml --- r: 66083 b: refs/heads/master c: 3084f0c6105a71e43225c36b4d97c1407988a242 h: refs/heads/master i: 66081: 86091b4f8c3e4f4ac0493456a64e7f79e666725a 66079: 88792e7706d1e0a479deb8329eed9f975c74a015 v: v3 --- [refs] | 2 +- trunk/drivers/block/umem.c | 2 +- trunk/{include/linux => drivers/block}/umem.h | 5 ----- trunk/include/linux/pci_ids.h | 5 +++++ 4 files changed, 7 insertions(+), 7 deletions(-) rename trunk/{include/linux => drivers/block}/umem.h (95%) diff --git a/[refs] b/[refs] index efab034666eb..999ff5dc92c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed155a95a4eb7d8dae61b64ab394314c5195e414 +refs/heads/master: 3084f0c6105a71e43225c36b4d97c1407988a242 diff --git a/trunk/drivers/block/umem.c b/trunk/drivers/block/umem.c index be7fac86725e..33ef7661e1c1 100644 --- a/trunk/drivers/block/umem.c +++ b/trunk/drivers/block/umem.c @@ -52,7 +52,7 @@ #include /* O_ACCMODE */ #include /* HDIO_GETGEO */ -#include +#include "umem.h" #include #include diff --git a/trunk/include/linux/umem.h b/trunk/drivers/block/umem.h similarity index 95% rename from trunk/include/linux/umem.h rename to trunk/drivers/block/umem.h index f36ebfc32bf6..3a3819afed92 100644 --- a/trunk/include/linux/umem.h +++ b/trunk/drivers/block/umem.h @@ -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 diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h index 55f307ffbf96..506b9ae241fd 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/include/linux/pci_ids.h @@ -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