diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 16:25:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 16:25:00 -0400 |
| commit | 068345f4a873e8b0b511e8f94a595a20e176eeff (patch) | |
| tree | f67503164f017b45ab425827d71fb7d23920a519 /drivers/video | |
| parent | c39736823232bc3ca113c8228fa852c09fba300e (diff) | |
| parent | 0a85e9a271a754e352af8a8b625025017fd97449 (diff) | |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: (26 commits)
i2c-rpx: Remove
i2c-mpc: work around missing-9th-clock-pulse bug
i2c: New PMC MSP71xx TWI bus driver
i2c-savage4: Delete many unused defines
i2c/tsl2550: Speed up initialization
i2c: New bus driver for the TAOS evaluation modules
i2c-i801: Use the internal 32-byte buffer on ICH4+
i2c-i801: Various cleanups
i2c: Add support for the TSL2550
i2c-pxa: Support new-style I2C drivers
i2c-gpio: Make some internal functions static
i2c-gpio: Add support for new-style clients
i2c-iop3xx: Switch to static adapter numbering
i2c-sis5595: Resolve resource conflict with sis5595
matroxfb: Clean-up i2c header inclusions
i2c-nforce2: Add support for SMBus block transactions
i2c-mpc: Use i2c_add_numbered_adapter
i2c-mv64xxx: Use i2c_add_numbered_adapter
i2c-piix4: Add support for the ATI SB700
i2c: New DS1682 chip driver
...
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/matrox/matroxfb_crtc2.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/matrox/matroxfb_crtc2.h b/drivers/video/matrox/matroxfb_crtc2.h index 608e40bb20e9..177177609be7 100644 --- a/drivers/video/matrox/matroxfb_crtc2.h +++ b/drivers/video/matrox/matroxfb_crtc2.h | |||
| @@ -2,8 +2,6 @@ | |||
| 2 | #define __MATROXFB_CRTC2_H__ | 2 | #define __MATROXFB_CRTC2_H__ |
| 3 | 3 | ||
| 4 | #include <linux/ioctl.h> | 4 | #include <linux/ioctl.h> |
| 5 | #include <linux/i2c.h> | ||
| 6 | #include <linux/i2c-algo-bit.h> | ||
| 7 | #include "matroxfb_base.h" | 5 | #include "matroxfb_base.h" |
| 8 | 6 | ||
| 9 | struct matroxfb_dh_fb_info { | 7 | struct matroxfb_dh_fb_info { |