aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-10-27 15:01:19 -0700
committerColin Cross <ccross@android.com>2011-10-27 15:01:19 -0700
commit2bb3e310159b65c88caf0c67a20ed257568be267 (patch)
treee4ad01c06a9e27939781c5dd9d0cb92e6fcd54d5 /drivers/video
parent2f53cb72c1574d3880d9e88e254b756565fe2f6d (diff)
parent97596c34030ed28657ccafddb67e17a03890b90a (diff)
downloadkernel_samsung_crespo-2bb3e310159b65c88caf0c67a20ed257568be267.zip
kernel_samsung_crespo-2bb3e310159b65c88caf0c67a20ed257568be267.tar.gz
kernel_samsung_crespo-2bb3e310159b65c88caf0c67a20ed257568be267.tar.bz2
Merge commit 'v3.0.8' into android-3.0
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/savage/savagefb.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/savage/savagefb.h b/drivers/video/savage/savagefb.h
index 32549d1..dcaab90 100644
--- a/drivers/video/savage/savagefb.h
+++ b/drivers/video/savage/savagefb.h
@@ -55,7 +55,7 @@
#define S3_SAVAGE3D_SERIES(chip) ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX))
-#define S3_SAVAGE4_SERIES(chip) ((chip>=S3_SAVAGE4) || (chip<=S3_PROSAVAGEDDR))
+#define S3_SAVAGE4_SERIES(chip) ((chip>=S3_SAVAGE4) && (chip<=S3_PROSAVAGEDDR))
#define S3_SAVAGE_MOBILE_SERIES(chip) ((chip==S3_SAVAGE_MX) || (chip==S3_SUPERSAVAGE))