The patch titled
CONFIG_PM=n slim: drivers/media/video/CVS drivers/media/video/Kconfig drivers/media/video/Kconfig.rej drivers/media/video/Kconfig~git-dvb drivers/media/video/Makefile drivers/media/video/Makefile.rej drivers/media/video/Makefile~git-dvb drivers/media/video/adv7170.c drivers/media/video/adv7175.c drivers/media/video/arv.c drivers/media/video/bt819.c drivers/media/video/bt856.c drivers/media/video/bt866.c drivers/media/video/bt866.c~git-dvb drivers/media/video/bt8xx drivers/media/video/btcx-risc.c drivers/media/video/btcx-risc.h drivers/media/video/built-in.o drivers/media/video/bw-qcam.c drivers/media/video/bw-qcam.h drivers/media/video/c-qcam.c drivers/media/video/compat_ioctl32.c drivers/media/video/compat_ioctl32.c.rej drivers/media/video/compat_ioctl32.c~git-dvb drivers/media/video/compat_ioctl32.ko drivers/media/video/compat_ioctl32.mod.c drivers/media/video/compat_ioctl32.mod.o drivers/media/video/compat_ioctl32.o drivers/media/video/cpia.c drivers/media/video/cpia!
.h drivers/media/video/cpia2 drivers/media/video/cpia_pp.c drivers/media/video/cpia_usb.c drivers/media/video/cs53l32a.c drivers/media/video/cs8420.h drivers/media/video/cx2341x.c drivers/media/video/cx25840 drivers/media/video/cx88 drivers/media/video/dabfirmware.h drivers/media/video/dabusb.c drivers/media/video/dabusb.h drivers/media/video/dabusb.ko drivers/media/video/dabusb.mod.c drivers/media/video/dabusb.mod.o drivers/media/video/dabusb.o drivers/media/video/dpc7146.c drivers/media/video/dsbr100.c~git-dvb drivers/media/video/em28xx drivers/media/video/et61x251 drivers/media/video/font.h drivers/media/video/hexium_gemini.c drivers/media/video/hexium_orion.c drivers/media/video/ibmmpeg2.h drivers/media/video/indycam.c drivers/media/video/indycam.h drivers/media/video/ir-kbd-i2c.c drivers/media/video/ks0127.c drivers/media/video/ks0127.h drivers/media/video/ls220 drivers/media/video/margi drivers/media/video/meye.c drivers/media/video/meye.h drivers/media/video/msp3400-d!
river.c drivers/media/video/msp3400-driver.h drivers/media/vi!
deo/msp3
400-kthreads.c drivers/media/video/msp3400-kthreads.c.rej drivers/media/video/msp3400-kthreads.c~git-dvb drivers/media/video/mt20xx.c drivers/media/video/mxb.c drivers/media/video/mxb.h drivers/media/video/ov511.c drivers/media/video/ov511.h drivers/media/video/ovcamchip drivers/media/video/planb.c drivers/media/video/planb.h drivers/media/video/pms.c drivers/media/video/pvrusb2 drivers/media/video/pwc drivers/media/video/saa5246a.c drivers/media/video/saa5246a.c~git-dvb drivers/media/video/saa5246a.h drivers/media/video/saa5249.c drivers/media/video/saa5249.c~git-dvb drivers/media/video/saa6588.c drivers/media/video/saa7110.c drivers/media/video/saa7111.c drivers/media/video/saa7114.c drivers/media/video/saa7115.c drivers/media/video/saa711x.c drivers/media/video/saa7121.h drivers/media/video/saa7127.c drivers/media/video/saa7134 drivers/media/video/saa7146.h drivers/media/video/saa7146reg.h drivers/media/video/saa7185.c drivers/media/video/saa7191.c drivers/media/video/saa!
7191.h drivers/media/video/saa7196.h drivers/media/video/se401.c drivers/media/video/se401.h drivers/media/video/sn9c102 drivers/media/video/stradis.c drivers/media/video/stv680.c drivers/media/video/stv680.h drivers/media/video/tda7432.c drivers/media/video/tda8290.c drivers/media/video/tda9840.c drivers/media/video/tda9840.h drivers/media/video/tda9875.c drivers/media/video/tda9887.c drivers/media/video/tea5767.c drivers/media/video/tea6415c.c drivers/media/video/tea6415c.h drivers/media/video/tea6420.c drivers/media/video/tea6420.h drivers/media/video/tlv320aic23b.c drivers/media/video/tuner-3036.c drivers/media/video/tuner-core.c drivers/media/video/tuner-simple.c drivers/media/video/tuner-simple.c~git-dvb drivers/media/video/tuner-types.c drivers/media/video/tuner-types.c.rej drivers/media/video/tuner-types.c~git-dvb drivers/media/video/tvaudio.c drivers/media/video/tveeprom.c drivers/media/video/tveeprom.c~git-dvb drivers/media/video/tvmixer.c drivers/media/video/tvp51!
50.c drivers/media/video/tvp5150.c~git-dvb drivers/media/vide!
o/tvp515
0_reg.h drivers/media/video/upd64031a.c drivers/media/video/upd64083.c drivers/media/video/usbvideo drivers/media/video/v4l1-compat.c drivers/media/video/v4l1-compat.c.rej drivers/media/video/v4l1-compat.c~git-dvb drivers/media/video/v4l1-compat.ko drivers/media/video/v4l1-compat.mod.c drivers/media/video/v4l1-compat.mod.o drivers/media/video/v4l1-compat.o drivers/media/video/v4l2-common.c drivers/media/video/v4l2-common.c.rej drivers/media/video/v4l2-common.c~git-dvb drivers/media/video/v4l2-common.ko drivers/media/video/v4l2-common.mod.c drivers/media/video/v4l2-common.mod.o drivers/media/video/v4l2-common.o drivers/media/video/video-buf-dvb.c drivers/media/video/video-buf-dvb.c~git-dvb drivers/media/video/video-buf.c drivers/media/video/videocodec.c drivers/media/video/videocodec.h drivers/media/video/videodev.c drivers/media/video/videodev.c.rej drivers/media/video/videodev.c~git-dvb drivers/media/video/videodev.ko drivers/media/video/videodev.mod.c drivers/media/video/v!
ideodev.mod.o drivers/media/video/videodev.o drivers/media/video/vino.c drivers/media/video/vino.c~git-dvb drivers/media/video/vino.h drivers/media/video/vivi.c drivers/media/video/vivi.c.rej drivers/media/video/vivi.c~git-dvb drivers/media/video/vpx3220.c drivers/media/video/w9966.c drivers/media/video/w9968cf.c drivers/media/video/w9968cf.h drivers/media/video/w9968cf_decoder.h drivers/media/video/w9968cf_vpp.h drivers/media/video/wm8739.c drivers/media/video/wm8775.c drivers/media/video/zc0301 drivers/media/video/zoran.h drivers/media/video/zoran_card.c drivers/media/video/zoran_card.h drivers/media/video/zoran_device.c drivers/media/video/zoran_device.h drivers/media/video/zoran_driver.c drivers/media/video/zoran_procfs.c drivers/media/video/zoran_procfs.h drivers/media/video/zr36016.c drivers/media/video/zr36016.h drivers/media/video/zr36050.c drivers/media/video/zr36050.h drivers/media/video/zr36057.h drivers/media/video/zr36060.c drivers/media/video/zr36060.h drivers/!
media/video/zr36120.c drivers/media/video/zr36120.h drivers/m!
edia/vid
eo/zr36120_i2c.c drivers/media/video/zr36120_mem.c drivers/media/video/zr36120_mem.h
has been removed from the -mm tree. Its filename is
config_pm=n-slim-drivers-media-video.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: CONFIG_PM=n slim: drivers/media/video/CVS drivers/media/video/Kconfig drivers/media/video/Kconfig.rej drivers/media/video/Kconfig~git-dvb drivers/media/video/Makefile drivers/media/video/Makefile.rej drivers/media/video/Makefile~git-dvb drivers/media/video/adv7170.c drivers/media/video/adv7175.c drivers/media/video/arv.c drivers/media/video/bt819.c drivers/media/video/bt856.c drivers/media/video/bt866.c drivers/media/video/bt866.c~git-dvb drivers/media/video/bt8xx drivers/media/video/btcx-risc.c drivers/media/video/btcx-risc.h drivers/media/video/built-in.o drivers/media/video/bw-qcam.c drivers/media/video/bw-qcam.h drivers/media/video/c-qcam.c drivers/media/video/compat_ioctl32.c drivers/media/video/compat_ioctl32.c.rej drivers/media/video/compat_ioctl32.c~git-dvb drivers/media/video/compat_ioctl32.ko drivers/media/video/compat_ioctl32.mod.c drivers/media/video/compat_ioctl32.mod.o drivers/media/video/compat_ioctl32.o drivers/media/video/cpia.c drivers/media/video/!
cpia.h drivers/media/video/cpia2 drivers/media/video/cpia_pp.c drivers/media/video/cpia_usb.c drivers/media/video/cs53l32a.c drivers/media/video/cs8420.h drivers/media/video/cx2341x.c drivers/media/video/cx25840 drivers/media/video/cx88 drivers/media/video/dabfirmware.h drivers/media/video/dabusb.c drivers/media/video/dabusb.h drivers/media/video/dabusb.ko drivers/media/video/dabusb.mod.c drivers/media/video/dabusb.mod.o drivers/media/video/dabusb.o drivers/media/video/dpc7146.c drivers/media/video/dsbr100.c~git-dvb drivers/media/video/em28xx drivers/media/video/et61x251 drivers/media/video/font.h drivers/media/video/hexium_gemini.c drivers/media/video/hexium_orion.c drivers/media/video/ibmmpeg2.h drivers/media/video/indycam.c drivers/media/video/indycam.h drivers/media/video/ir-kbd-i2c.c drivers/media/video/ks0127.c drivers/media/video/ks0127.h drivers/media/video/ls220 drivers/media/video/margi drivers/media/video/meye.c drivers/media/video/meye.h drivers/media/video/msp34!
00-driver.c drivers/media/video/msp3400-driver.h drivers/medi!
a/video/
msp3400-kthreads.c drivers/media/video/msp3400-kthreads.c.rej drivers/media/video/msp3400-kthreads.c~git-dvb drivers/media/video/mt20xx.c drivers/media/video/mxb.c drivers/media/video/mxb.h drivers/media/video/ov511.c drivers/media/video/ov511.h drivers/media/video/ovcamchip drivers/media/video/planb.c drivers/media/video/planb.h drivers/media/video/pms.c drivers/media/video/pvrusb2 drivers/media/video/pwc drivers/media/video/saa5246a.c drivers/media/video/saa5246a.c~git-dvb drivers/media/video/saa5246a.h drivers/media/video/saa5249.c drivers/media/video/saa5249.c~git-dvb drivers/media/video/saa6588.c drivers/media/video/saa7110.c drivers/media/video/saa7111.c drivers/media/video/saa7114.c drivers/media/video/saa7115.c drivers/media/video/saa711x.c drivers/media/video/saa7121.h drivers/media/video/saa7127.c drivers/media/video/saa7134 drivers/media/video/saa7146.h drivers/media/video/saa7146reg.h drivers/media/video/saa7185.c drivers/media/video/saa7191.c drivers/media/video!
/saa7191.h drivers/media/video/saa7196.h drivers/media/video/se401.c drivers/media/video/se401.h drivers/media/video/sn9c102 drivers/media/video/stradis.c drivers/media/video/stv680.c drivers/media/video/stv680.h drivers/media/video/tda7432.c drivers/media/video/tda8290.c drivers/media/video/tda9840.c drivers/media/video/tda9840.h drivers/media/video/tda9875.c drivers/media/video/tda9887.c drivers/media/video/tea5767.c drivers/media/video/tea6415c.c drivers/media/video/tea6415c.h drivers/media/video/tea6420.c drivers/media/video/tea6420.h drivers/media/video/tlv320aic23b.c drivers/media/video/tuner-3036.c drivers/media/video/tuner-core.c drivers/media/video/tuner-simple.c drivers/media/video/tuner-simple.c~git-dvb drivers/media/video/tuner-types.c drivers/media/video/tuner-types.c.rej drivers/media/video/tuner-types.c~git-dvb drivers/media/video/tvaudio.c drivers/media/video/tveeprom.c drivers/media/video/tveeprom.c~git-dvb drivers/media/video/tvmixer.c drivers/media/video/t!
vp5150.c drivers/media/video/tvp5150.c~git-dvb drivers/media/!
video/tv
p5150_reg.h drivers/media/video/upd64031a.c drivers/media/video/upd64083.c drivers/media/video/usbvideo drivers/media/video/v4l1-compat.c drivers/media/video/v4l1-compat.c.rej drivers/media/video/v4l1-compat.c~git-dvb drivers/media/video/v4l1-compat.ko drivers/media/video/v4l1-compat.mod.c drivers/media/video/v4l1-compat.mod.o drivers/media/video/v4l1-compat.o drivers/media/video/v4l2-common.c drivers/media/video/v4l2-common.c.rej drivers/media/video/v4l2-common.c~git-dvb drivers/media/video/v4l2-common.ko drivers/media/video/v4l2-common.mod.c drivers/media/video/v4l2-common.mod.o drivers/media/video/v4l2-common.o drivers/media/video/video-buf-dvb.c drivers/media/video/video-buf-dvb.c~git-dvb drivers/media/video/video-buf.c drivers/media/video/videocodec.c drivers/media/video/videocodec.h drivers/media/video/videodev.c drivers/media/video/videodev.c.rej drivers/media/video/videodev.c~git-dvb drivers/media/video/videodev.ko drivers/media/video/videodev.mod.c drivers/media/vid!
eo/videodev.mod.o drivers/media/video/videodev.o drivers/media/video/vino.c drivers/media/video/vino.c~git-dvb drivers/media/video/vino.h drivers/media/video/vivi.c drivers/media/video/vivi.c.rej drivers/media/video/vivi.c~git-dvb drivers/media/video/vpx3220.c drivers/media/video/w9966.c drivers/media/video/w9968cf.c drivers/media/video/w9968cf.h drivers/media/video/w9968cf_decoder.h drivers/media/video/w9968cf_vpp.h drivers/media/video/wm8739.c drivers/media/video/wm8775.c drivers/media/video/zc0301 drivers/media/video/zoran.h drivers/media/video/zoran_card.c drivers/media/video/zoran_card.h drivers/media/video/zoran_device.c drivers/media/video/zoran_device.h drivers/media/video/zoran_driver.c drivers/media/video/zoran_procfs.c drivers/media/video/zoran_procfs.h drivers/media/video/zr36016.c drivers/media/video/zr36016.h drivers/media/video/zr36050.c drivers/media/video/zr36050.h drivers/media/video/zr36057.h drivers/media/video/zr36060.c drivers/media/video/zr36060.h driv!
ers/media/video/zr36120.c drivers/media/video/zr36120.h drive!
rs/media
/video/zr36120_i2c.c drivers/media/video/zr36120_mem.c drivers/media/video/zr36120_mem.h
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Remove some code which is unneeded if CONFIG_PM=n.
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/media/video/bt8xx/bttv-driver.c | 4 ++++
drivers/media/video/cx88/cx88-blackbird.c | 2 ++
drivers/media/video/cx88/cx88-dvb.c | 2 ++
drivers/media/video/cx88/cx88-video.c | 7 ++++++-
4 files changed, 14 insertions(+), 1 deletion(-)
diff -puN drivers/media/video/bt8xx/bttv-driver.c~config_pm=n-slim-drivers-media-video drivers/media/video/bt8xx/bttv-driver.c
--- a/drivers/media/video/bt8xx/bttv-driver.c~config_pm=n-slim-drivers-media-video
+++ a/drivers/media/video/bt8xx/bttv-driver.c
@@ -4194,6 +4194,7 @@ static void __devexit bttv_remove(struct
return;
}
+#ifdef CONFIG_PM
static int bttv_suspend(struct pci_dev *pci_dev, pm_message_t state)
{
struct bttv *btv = pci_get_drvdata(pci_dev);
@@ -4274,6 +4275,7 @@ static int bttv_resume(struct pci_dev *p
spin_unlock_irqrestore(&btv->s_lock,flags);
return 0;
}
+#endif
static struct pci_device_id bttv_pci_tbl[] = {
{PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT848,
@@ -4294,8 +4296,10 @@ static struct pci_driver bttv_pci_driver
.id_table = bttv_pci_tbl,
.probe = bttv_probe,
.remove = __devexit_p(bttv_remove),
+#ifdef CONFIG_PM
.suspend = bttv_suspend,
.resume = bttv_resume,
+#endif
};
static int bttv_init_module(void)
diff -puN drivers/media/video/cx88/cx88-blackbird.c~config_pm=n-slim-drivers-media-video drivers/media/video/cx88/cx88-blackbird.c
--- a/drivers/media/video/cx88/cx88-blackbird.c~config_pm=n-slim-drivers-media-video
+++ a/drivers/media/video/cx88/cx88-blackbird.c
@@ -1160,8 +1160,10 @@ static struct pci_driver blackbird_pci_d
.id_table = cx8802_pci_tbl,
.probe = blackbird_probe,
.remove = __devexit_p(blackbird_remove),
+#ifdef CONFIG_PM
.suspend = cx8802_suspend_common,
.resume = cx8802_resume_common,
+#endif
};
static int blackbird_init(void)
diff -puN drivers/media/video/cx88/cx88-dvb.c~config_pm=n-slim-drivers-media-video drivers/media/video/cx88/cx88-dvb.c
--- a/drivers/media/video/cx88/cx88-dvb.c~config_pm=n-slim-drivers-media-video
+++ a/drivers/media/video/cx88/cx88-dvb.c
@@ -870,8 +870,10 @@ static struct pci_driver dvb_pci_driver
.id_table = cx8802_pci_tbl,
.probe = dvb_probe,
.remove = __devexit_p(dvb_remove),
+#ifdef CONFIG_PM
.suspend = cx8802_suspend_common,
.resume = cx8802_resume_common,
+#endif
};
static int dvb_init(void)
diff -puN drivers/media/video/cx88/cx88-video.c~config_pm=n-slim-drivers-media-video drivers/media/video/cx88/cx88-video.c
--- a/drivers/media/video/cx88/cx88-video.c~config_pm=n-slim-drivers-media-video
+++ a/drivers/media/video/cx88/cx88-video.c
@@ -497,6 +497,7 @@ static int start_video_dma(struct cx8800
return 0;
}
+#ifdef CONFIG_PM
static int stop_video_dma(struct cx8800_dev *dev)
{
struct cx88_core *core = dev->core;
@@ -512,6 +513,7 @@ static int stop_video_dma(struct cx8800_
cx_clear(MO_VID_INTMSK, 0x0f0011);
return 0;
}
+#endif
static int restart_video_queue(struct cx8800_dev *dev,
struct cx88_dmaqueue *q)
@@ -2017,6 +2019,7 @@ static void __devexit cx8800_finidev(str
kfree(dev);
}
+#ifdef CONFIG_PM
static int cx8800_suspend(struct pci_dev *pci_dev, pm_message_t state)
{
struct cx8800_dev *dev = pci_get_drvdata(pci_dev);
@@ -2092,6 +2095,7 @@ static int cx8800_resume(struct pci_dev
return 0;
}
+#endif
/* ----------------------------------------------------------- */
@@ -2112,9 +2116,10 @@ static struct pci_driver cx8800_pci_driv
.id_table = cx8800_pci_tbl,
.probe = cx8800_initdev,
.remove = __devexit_p(cx8800_finidev),
-
+#ifdef CONFIG_PM
.suspend = cx8800_suspend,
.resume = cx8800_resume,
+#endif
};
static int cx8800_init(void)
_
Patches currently in -mm which might be from adobriyan@xxxxxxxxx are
fix-docs-for-fssuid_dumpable-6145.patch
emu10k1x-simplify-around-pci_register_driver.patch
git-agpgart.patch
git-dvb.patch
config_pm=n-slim-drivers-ieee1394-ohci1394c.patch
config_pm=n-slim-drivers-scsi-sata_sil.patch
xircom_cb-wire-up-errors-from-pci_register_driver.patch
config_pm=n-slim-drivers-pcmcia.patch
i82092-wire-up-errors-from-pci_register_driver.patch
config_pm=n-slim-drivers-serial-8250_pcic.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
git-xfs.patch
sh-fix-fpn_start-typo.patch
headers_check-improve-include-regexp.patch
headers_check-clarify-error-message.patch
task_struct-ifdef-missedem-v-ipc.patch
ifdef-blktrace-debugging-fields.patch
tty_ioc-keep-davej-sane.patch
ifdef-quota_read-quota_write.patch
reiserfs-ifdef-xattr_sem.patch
reiserfs-ifdef-acl-stuff-from-inode.patch
fsh-ifdef-security-fields.patch
config_pm=n-slim-drivers-parport-parport_serialc.patch
config_pm=n-slim-sound-oss-tridentc.patch
config_pm=n-slim-sound-oss-cs46xxc.patch
remove-null-check-in-register_nls.patch
config_pm=n-slim-drivers-ide-pci-sc1200c.patch
fs-kconfig-split-ext2.patch
fs-kconfig-split-ext3.patch
fs-kconfig-split-jbd.patch
fs-kconfig-split-reiserfs.patch
fs-kconfig-split-jfs.patch
fs-kconfig-split-ocfs2.patch
fs-kconfig-split-minix.patch
fs-kconfig-split-romfs.patch
fs-kconfig-split-autofs.patch
fs-kconfig-split-autofs4.patch
fs-kconfig-split-fuse.patch
fs-kconfig-split-isofs.patch
fs-kconfig-split-udf.patch
fs-kconfig-split-fat.patch
fs-kconfig-split-msdos.patch
fs-kconfig-split-vfat.patch
fs-kconfig-split-ntfs.patch
fs-kconfig-split-proc.patch
fs-kconfig-split-sysfs.patch
fs-kconfig-split-hugetlbfs.patch
fs-kconfig-split-ramfs.patch
fs-kconfig-split-configfs.patch
fs-kconfig-split-adfs.patch
fs-kconfig-split-affs.patch
fs-kconfig-split-ecryptfs.patch
fs-kconfig-split-hfs.patch
fs-kconfig-split-hfsplus.patch
fs-kconfig-split-befs.patch
fs-kconfig-split-bfs.patch
fs-kconfig-split-efs.patch
fs-kconfig-split-jffs.patch
fs-kconfig-split-jffs2.patch
fs-kconfig-split-cramfs.patch
fs-kconfig-split-freevxfs.patch
fs-kconfig-split-hpfs.patch
fs-kconfig-split-qnx4.patch
fs-kconfig-split-sysv.patch
fs-kconfig-split-ufs.patch
fs-kconfig-split-smbfs.patch
fs-kconfig-split-cifs.patch
fs-kconfig-split-ncpfs.patch
fs-kconfig-split-coda.patch
fs-kconfig-split-afs.patch
fs-kconfig-split-9p.patch
documentation-ioctl-messtxt-start-tree-wide-ioctl-registry.patch
ioctl-messtxt-xfs-typos.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
