From 83bafc48ea7e208a13e92431df1b5bfd15e85548 Mon Sep 17 00:00:00 2001
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Mon, 7 Nov 2005 06:31:50 -0500
Subject: [PATCH] --- yaml --- r: 15389 b: refs/heads/master c:
 ef797546a93fffa9d8508e7c8539b352b6678568 h: refs/heads/master i:   15387:
 5f6bbca7a236dc1710e2cbe169a8eba6fa6f50db v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/ieee1394/dv1394.c    | 9 ---------
 trunk/drivers/ieee1394/video1394.c | 8 --------
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index b13938c0b13b..99ff5eb0bd86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8551158abc8ef45a7f473a87e69624d05ebfd684
+refs/heads/master: ef797546a93fffa9d8508e7c8539b352b6678568
diff --git a/trunk/drivers/ieee1394/dv1394.c b/trunk/drivers/ieee1394/dv1394.c
index d204ec772c0a..196db7439272 100644
--- a/trunk/drivers/ieee1394/dv1394.c
+++ b/trunk/drivers/ieee1394/dv1394.c
@@ -123,15 +123,6 @@
 
 #include "ohci1394.h"
 
-#ifndef virt_to_page
-#define virt_to_page(x) MAP_NR(x)
-#endif
-
-#ifndef vmalloc_32
-#define vmalloc_32(x) vmalloc(x)
-#endif
-
-
 /* DEBUG LEVELS:
    0 - no debugging messages
    1 - some debugging messages, but none during DMA frame transmission
diff --git a/trunk/drivers/ieee1394/video1394.c b/trunk/drivers/ieee1394/video1394.c
index 2ad30cd7c5aa..07050f0e4098 100644
--- a/trunk/drivers/ieee1394/video1394.c
+++ b/trunk/drivers/ieee1394/video1394.c
@@ -77,14 +77,6 @@
 
 #define ISO_CHANNELS 64
 
-#ifndef virt_to_page
-#define virt_to_page(x) MAP_NR(x)
-#endif
-
-#ifndef vmalloc_32
-#define vmalloc_32(x) vmalloc(x)
-#endif
-
 struct it_dma_prg {
 	struct dma_cmd begin;
 	quadlet_t data[4];