From 6e42df79f3f43f3bc5729765d1204e0c0ca0ce89 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 15 Feb 2013 12:04:57 -0800 Subject: [PATCH] --- yaml --- r: 349775 b: refs/heads/master c: 5c0857a9afc74ec83e222ea1b9808988d08139d9 h: refs/heads/master i: 349773: 00477f32bd2b2f46c19486b9a6bdd1c5a88b00c4 349771: 0bf0c9a2a834b494c21f25f27887c84674cb1a89 349767: 5f253b7c184c84f3a3aab761ce582e453c2dadce 349759: 671a3e698636e311709143a52275f14ca57cc14f v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 16 +++------------- trunk/drivers/pci/remove.c | 2 ++ trunk/drivers/staging/omapdrm/Kconfig | 2 +- trunk/drivers/video/omap2/dss/dss_features.c | 1 + 5 files changed, 8 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index b57f76feb269..40652c0c8c3a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1de63d60cd5b0d33a812efa455d5933bf1564a51 +refs/heads/master: 5c0857a9afc74ec83e222ea1b9808988d08139d9 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 35a56bcd5e75..3b955649c325 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1303,7 +1303,7 @@ F: include/linux/dmaengine.h F: include/linux/async_tx.h AT24 EEPROM DRIVER -M: Wolfram Sang +M: Wolfram Sang L: linux-i2c@vger.kernel.org S: Maintained F: drivers/misc/eeprom/at24.c @@ -3757,12 +3757,11 @@ S: Maintained F: drivers/i2c/i2c-stub.c I2C SUBSYSTEM -M: Wolfram Sang +M: Wolfram Sang M: "Ben Dooks (embedded platforms)" L: linux-i2c@vger.kernel.org W: http://i2c.wiki.kernel.org/ -T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ -T: git git://git.pengutronix.de/git/wsa/linux.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git S: Maintained F: Documentation/i2c/ F: drivers/i2c/ @@ -5778,15 +5777,6 @@ L: linux-i2c@vger.kernel.org S: Maintained F: drivers/i2c/muxes/i2c-mux-pca9541.c -PCA9564/PCA9665 I2C BUS DRIVER -M: Wolfram Sang -L: linux-i2c@vger.kernel.org -S: Maintained -F: drivers/i2c/algos/i2c-algo-pca.c -F: drivers/i2c/busses/i2c-pca-* -F: include/linux/i2c-algo-pca.h -F: include/linux/i2c-pca-platform.h - PCDP - PRIMARY CONSOLE AND DEBUG PORT M: Khalid Aziz S: Maintained diff --git a/trunk/drivers/pci/remove.c b/trunk/drivers/pci/remove.c index 7c0fd9252e6f..84954a726a94 100644 --- a/trunk/drivers/pci/remove.c +++ b/trunk/drivers/pci/remove.c @@ -19,6 +19,8 @@ static void pci_free_resources(struct pci_dev *dev) static void pci_stop_dev(struct pci_dev *dev) { + pci_pme_active(dev, false); + if (dev->is_added) { pci_proc_detach_device(dev); pci_remove_sysfs_dev_files(dev); diff --git a/trunk/drivers/staging/omapdrm/Kconfig b/trunk/drivers/staging/omapdrm/Kconfig index b724a4131435..09f65dc3d2c8 100644 --- a/trunk/drivers/staging/omapdrm/Kconfig +++ b/trunk/drivers/staging/omapdrm/Kconfig @@ -3,8 +3,8 @@ config DRM_OMAP tristate "OMAP DRM" depends on DRM && !CONFIG_FB_OMAP2 depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM + depends on OMAP2_DSS select DRM_KMS_HELPER - select OMAP2_DSS select FB_SYS_FILLRECT select FB_SYS_COPYAREA select FB_SYS_IMAGEBLIT diff --git a/trunk/drivers/video/omap2/dss/dss_features.c b/trunk/drivers/video/omap2/dss/dss_features.c index 18688c12e30d..d7d66ef5cb58 100644 --- a/trunk/drivers/video/omap2/dss/dss_features.c +++ b/trunk/drivers/video/omap2/dss/dss_features.c @@ -538,6 +538,7 @@ static const enum dss_feat_id omap3630_dss_feat_list[] = { FEAT_ALPHA_FIXED_ZORDER, FEAT_FIFO_MERGE, FEAT_OMAP3_DSI_FIFO_BUG, + FEAT_DPI_USES_VDDS_DSI, }; static const enum dss_feat_id omap4430_es1_0_dss_feat_list[] = {