summaryrefslogtreecommitdiffstats
path: root/drivers/video/sa1100fb.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-02-17 21:09:59 +0100
committerJeff Garzik <jeff@garzik.org>2007-02-17 21:09:59 +0100
commit48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (patch)
treeda3aa535c98cc0957851354ceb0fbff7482d7a9d /drivers/video/sa1100fb.h
parentphy devices: use same arg types (diff)
parentConvert network devices to use struct device instead of class_device (diff)
downloadlinux-48c871c1f6a7c7044dd76774fb469e65c7e2e4e8.tar.xz
linux-48c871c1f6a7c7044dd76774fb469e65c7e2e4e8.zip
Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream
Diffstat (limited to 'drivers/video/sa1100fb.h')
-rw-r--r--drivers/video/sa1100fb.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/video/sa1100fb.h b/drivers/video/sa1100fb.h
index 0b07f6ae3367..48066ef3af05 100644
--- a/drivers/video/sa1100fb.h
+++ b/drivers/video/sa1100fb.h
@@ -110,9 +110,7 @@ struct sa1100fb_info {
#endif
};
-#define __type_entry(ptr,type,member) ((type *)((char *)(ptr)-offsetof(type,member)))
-
-#define TO_INF(ptr,member) __type_entry(ptr,struct sa1100fb_info,member)
+#define TO_INF(ptr,member) container_of(ptr,struct sa1100fb_info,member)
#define SA1100_PALETTE_MODE_VAL(bpp) (((bpp) & 0x018) << 9)