aboutsummaryrefslogtreecommitdiff
path: root/drivers/video/savage/savagefb.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-09-16 02:46:15 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-09-16 02:46:15 -0400
commitc5f977a0d2d6a8f02f32139b5dd129e52073f38f (patch)
tree82180b8f21992312ad78becf759f21b9110e72ca /drivers/video/savage/savagefb.h
parentf3d242e8f2bf12cb45eb35b7d2e69483d1209b13 (diff)
parent065d9cac98a5406ecd5a1368f8fd38f55739dee9 (diff)
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/video/savage/savagefb.h')
-rw-r--r--drivers/video/savage/savagefb.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/video/savage/savagefb.h b/drivers/video/savage/savagefb.h
index d6f94742c9f..ea17f7e0482 100644
--- a/drivers/video/savage/savagefb.h
+++ b/drivers/video/savage/savagefb.h
@@ -60,8 +60,6 @@
#define S3_SAVAGE_SERIES(chip) ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE2000))
-#define S3_MOBILE_TWISTER_SERIES(chip) ((chip==S3_TWISTER) || (chip == S3_PROSAVAGEDDR))
-
/* Chip tags. These are used to group the adapters into
* related families.
*/
@@ -74,8 +72,6 @@ typedef enum {
S3_PROSAVAGE,
S3_SUPERSAVAGE,
S3_SAVAGE2000,
- S3_PROSAVAGEDDR,
- S3_TWISTER,
S3_LAST
} savage_chipset;