Pull sn-features into release branch

[linux-2.6-omap-h63xx.git] / include / media / id.h

diff --git a/include/media/id.h b/include/media/id.h
index a39a6423914bc553f8b79e9139ba7221c0710380..6d02c94cdc0db4dcb5b888ec95e2fe5f4f4beeae 100644 (file)
--- a/include/media/id.h
+++ b/include/media/id.h
@@ -1,5 +1,4 @@
 /*
- * $Id: id.h,v 1.4 2005/06/12 04:19:19 mchehab Exp $
  */
 
 /* FIXME: this temporarely, until these are included in linux/i2c-id.h */
@@ -34,8 +33,3 @@
 #ifndef  I2C_DRIVERID_SAA6752HS
 # define I2C_DRIVERID_SAA6752HS I2C_DRIVERID_EXP0+8
 #endif
-
-/* algorithms */
-#ifndef I2C_ALGO_SAA7134
-# define I2C_ALGO_SAA7134 0x090000
-#endif