Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: Staging: dream: remove dream driver and arch from tree
2026-10-14 05:55:17 +00:00 · 2010-10-29 14:16:08 -07:00 · 2010-10-29 14:16:08 -07:00 · d56f84e7e3
commit d56f84e7e3
parent 12462f2df4 3414df8ca3
93 changed files with 0 additions and 39835 deletions
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
--- a/drivers/staging/dream/Kconfig
+++ b/drivers/staging/dream/Kconfig
--- a/drivers/staging/dream/Makefile
+++ b/drivers/staging/dream/Makefile
--- a/drivers/staging/dream/TODO
+++ b/drivers/staging/dream/TODO
--- a/drivers/staging/dream/camera/Kconfig
+++ b/drivers/staging/dream/camera/Kconfig
--- a/drivers/staging/dream/camera/Makefile
+++ b/drivers/staging/dream/camera/Makefile
--- a/drivers/staging/dream/camera/msm_camera.c
+++ b/drivers/staging/dream/camera/msm_camera.c
--- a/drivers/staging/dream/camera/msm_io7x.c
+++ b/drivers/staging/dream/camera/msm_io7x.c
--- a/drivers/staging/dream/camera/msm_io8x.c
+++ b/drivers/staging/dream/camera/msm_io8x.c
--- a/drivers/staging/dream/camera/msm_v4l2.c
+++ b/drivers/staging/dream/camera/msm_v4l2.c
--- a/drivers/staging/dream/camera/msm_vfe7x.c
+++ b/drivers/staging/dream/camera/msm_vfe7x.c
--- a/drivers/staging/dream/camera/msm_vfe7x.h
+++ b/drivers/staging/dream/camera/msm_vfe7x.h
--- a/drivers/staging/dream/camera/msm_vfe8x.c
+++ b/drivers/staging/dream/camera/msm_vfe8x.c
--- a/drivers/staging/dream/camera/msm_vfe8x.h
+++ b/drivers/staging/dream/camera/msm_vfe8x.h
--- a/drivers/staging/dream/camera/msm_vfe8x_proc.c
+++ b/drivers/staging/dream/camera/msm_vfe8x_proc.c
--- a/drivers/staging/dream/camera/msm_vfe8x_proc.h
+++ b/drivers/staging/dream/camera/msm_vfe8x_proc.h
--- a/drivers/staging/dream/camera/mt9d112.c
+++ b/drivers/staging/dream/camera/mt9d112.c
--- a/drivers/staging/dream/camera/mt9d112.h
+++ b/drivers/staging/dream/camera/mt9d112.h
--- a/drivers/staging/dream/camera/mt9d112_reg.c
+++ b/drivers/staging/dream/camera/mt9d112_reg.c
--- a/drivers/staging/dream/camera/mt9p012.h
+++ b/drivers/staging/dream/camera/mt9p012.h
--- a/drivers/staging/dream/camera/mt9p012_fox.c
+++ b/drivers/staging/dream/camera/mt9p012_fox.c
--- a/drivers/staging/dream/camera/mt9p012_reg.c
+++ b/drivers/staging/dream/camera/mt9p012_reg.c
--- a/drivers/staging/dream/camera/mt9t013.c
+++ b/drivers/staging/dream/camera/mt9t013.c
--- a/drivers/staging/dream/camera/mt9t013.h
+++ b/drivers/staging/dream/camera/mt9t013.h
--- a/drivers/staging/dream/camera/mt9t013_reg.c
+++ b/drivers/staging/dream/camera/mt9t013_reg.c
--- a/drivers/staging/dream/camera/s5k3e2fx.c
+++ b/drivers/staging/dream/camera/s5k3e2fx.c
--- a/drivers/staging/dream/camera/s5k3e2fx.h
+++ b/drivers/staging/dream/camera/s5k3e2fx.h
--- a/drivers/staging/dream/generic_gpio.c
+++ b/drivers/staging/dream/generic_gpio.c
--- a/drivers/staging/dream/gpio_axis.c
+++ b/drivers/staging/dream/gpio_axis.c
--- a/drivers/staging/dream/gpio_event.c
+++ b/drivers/staging/dream/gpio_event.c
--- a/drivers/staging/dream/gpio_input.c
+++ b/drivers/staging/dream/gpio_input.c
--- a/drivers/staging/dream/gpio_matrix.c
+++ b/drivers/staging/dream/gpio_matrix.c
--- a/drivers/staging/dream/gpio_output.c
+++ b/drivers/staging/dream/gpio_output.c
--- a/drivers/staging/dream/include/linux/android_pmem.h
+++ b/drivers/staging/dream/include/linux/android_pmem.h
--- a/drivers/staging/dream/include/linux/gpio_event.h
+++ b/drivers/staging/dream/include/linux/gpio_event.h
--- a/drivers/staging/dream/include/linux/msm_adsp.h
+++ b/drivers/staging/dream/include/linux/msm_adsp.h
--- a/drivers/staging/dream/include/linux/msm_audio.h
+++ b/drivers/staging/dream/include/linux/msm_audio.h
--- a/drivers/staging/dream/include/linux/msm_rpcrouter.h
+++ b/drivers/staging/dream/include/linux/msm_rpcrouter.h
--- a/drivers/staging/dream/include/linux/wakelock.h
+++ b/drivers/staging/dream/include/linux/wakelock.h
--- a/drivers/staging/dream/include/mach/camera.h
+++ b/drivers/staging/dream/include/mach/camera.h
--- a/drivers/staging/dream/include/mach/msm_adsp.h
+++ b/drivers/staging/dream/include/mach/msm_adsp.h
--- a/drivers/staging/dream/include/mach/msm_rpcrouter.h
+++ b/drivers/staging/dream/include/mach/msm_rpcrouter.h
--- a/drivers/staging/dream/include/mach/msm_smd.h
+++ b/drivers/staging/dream/include/mach/msm_smd.h
--- a/drivers/staging/dream/include/mach/qdsp5/qdsp5audplaycmdi.h
+++ b/drivers/staging/dream/include/mach/qdsp5/qdsp5audplaycmdi.h
--- a/drivers/staging/dream/include/mach/qdsp5/qdsp5audplaymsg.h
+++ b/drivers/staging/dream/include/mach/qdsp5/qdsp5audplaymsg.h
--- a/drivers/staging/dream/include/mach/qdsp5/qdsp5audppcmdi.h
+++ b/drivers/staging/dream/include/mach/qdsp5/qdsp5audppcmdi.h
--- a/drivers/staging/dream/include/mach/qdsp5/qdsp5audppmsg.h
+++ b/drivers/staging/dream/include/mach/qdsp5/qdsp5audppmsg.h
--- a/drivers/staging/dream/include/mach/qdsp5/qdsp5audpreproccmdi.h
+++ b/drivers/staging/dream/include/mach/qdsp5/qdsp5audpreproccmdi.h
--- a/drivers/staging/dream/include/mach/qdsp5/qdsp5audpreprocmsg.h
+++ b/drivers/staging/dream/include/mach/qdsp5/qdsp5audpreprocmsg.h
--- a/drivers/staging/dream/include/mach/qdsp5/qdsp5audreccmdi.h
+++ b/drivers/staging/dream/include/mach/qdsp5/qdsp5audreccmdi.h
--- a/drivers/staging/dream/include/mach/qdsp5/qdsp5audrecmsg.h
+++ b/drivers/staging/dream/include/mach/qdsp5/qdsp5audrecmsg.h
--- a/drivers/staging/dream/include/mach/qdsp5/qdsp5jpegcmdi.h
+++ b/drivers/staging/dream/include/mach/qdsp5/qdsp5jpegcmdi.h
--- a/drivers/staging/dream/include/mach/qdsp5/qdsp5jpegmsg.h
+++ b/drivers/staging/dream/include/mach/qdsp5/qdsp5jpegmsg.h
--- a/drivers/staging/dream/include/mach/qdsp5/qdsp5lpmcmdi.h
+++ b/drivers/staging/dream/include/mach/qdsp5/qdsp5lpmcmdi.h
--- a/drivers/staging/dream/include/mach/qdsp5/qdsp5lpmmsg.h
+++ b/drivers/staging/dream/include/mach/qdsp5/qdsp5lpmmsg.h
--- a/drivers/staging/dream/include/mach/qdsp5/qdsp5vdeccmdi.h
+++ b/drivers/staging/dream/include/mach/qdsp5/qdsp5vdeccmdi.h
--- a/drivers/staging/dream/include/mach/qdsp5/qdsp5vdecmsg.h
+++ b/drivers/staging/dream/include/mach/qdsp5/qdsp5vdecmsg.h
--- a/drivers/staging/dream/include/mach/qdsp5/qdsp5venccmdi.h
+++ b/drivers/staging/dream/include/mach/qdsp5/qdsp5venccmdi.h
--- a/drivers/staging/dream/include/mach/qdsp5/qdsp5vfecmdi.h
+++ b/drivers/staging/dream/include/mach/qdsp5/qdsp5vfecmdi.h
--- a/drivers/staging/dream/include/mach/qdsp5/qdsp5vfemsg.h
+++ b/drivers/staging/dream/include/mach/qdsp5/qdsp5vfemsg.h
--- a/drivers/staging/dream/include/media/msm_camera.h
+++ b/drivers/staging/dream/include/media/msm_camera.h
--- a/drivers/staging/dream/pmem.c
+++ b/drivers/staging/dream/pmem.c
--- a/drivers/staging/dream/qdsp5/Makefile
+++ b/drivers/staging/dream/qdsp5/Makefile
--- a/drivers/staging/dream/qdsp5/adsp.c
+++ b/drivers/staging/dream/qdsp5/adsp.c
--- a/drivers/staging/dream/qdsp5/adsp.h
+++ b/drivers/staging/dream/qdsp5/adsp.h
--- a/drivers/staging/dream/qdsp5/adsp_6210.c
+++ b/drivers/staging/dream/qdsp5/adsp_6210.c
--- a/drivers/staging/dream/qdsp5/adsp_6220.c
+++ b/drivers/staging/dream/qdsp5/adsp_6220.c
--- a/drivers/staging/dream/qdsp5/adsp_6225.c
+++ b/drivers/staging/dream/qdsp5/adsp_6225.c
--- a/drivers/staging/dream/qdsp5/adsp_driver.c
+++ b/drivers/staging/dream/qdsp5/adsp_driver.c
--- a/drivers/staging/dream/qdsp5/adsp_info.c
+++ b/drivers/staging/dream/qdsp5/adsp_info.c
--- a/drivers/staging/dream/qdsp5/adsp_jpeg_patch_event.c
+++ b/drivers/staging/dream/qdsp5/adsp_jpeg_patch_event.c
--- a/drivers/staging/dream/qdsp5/adsp_jpeg_verify_cmd.c
+++ b/drivers/staging/dream/qdsp5/adsp_jpeg_verify_cmd.c
--- a/drivers/staging/dream/qdsp5/adsp_lpm_verify_cmd.c
+++ b/drivers/staging/dream/qdsp5/adsp_lpm_verify_cmd.c
--- a/drivers/staging/dream/qdsp5/adsp_vfe_patch_event.c
+++ b/drivers/staging/dream/qdsp5/adsp_vfe_patch_event.c
--- a/drivers/staging/dream/qdsp5/adsp_vfe_verify_cmd.c
+++ b/drivers/staging/dream/qdsp5/adsp_vfe_verify_cmd.c
--- a/drivers/staging/dream/qdsp5/adsp_video_verify_cmd.c
+++ b/drivers/staging/dream/qdsp5/adsp_video_verify_cmd.c
--- a/drivers/staging/dream/qdsp5/adsp_videoenc_verify_cmd.c
+++ b/drivers/staging/dream/qdsp5/adsp_videoenc_verify_cmd.c
--- a/drivers/staging/dream/qdsp5/audio_aac.c
+++ b/drivers/staging/dream/qdsp5/audio_aac.c
--- a/drivers/staging/dream/qdsp5/audio_amrnb.c
+++ b/drivers/staging/dream/qdsp5/audio_amrnb.c
--- a/drivers/staging/dream/qdsp5/audio_evrc.c
+++ b/drivers/staging/dream/qdsp5/audio_evrc.c
--- a/drivers/staging/dream/qdsp5/audio_in.c
+++ b/drivers/staging/dream/qdsp5/audio_in.c
--- a/drivers/staging/dream/qdsp5/audio_mp3.c
+++ b/drivers/staging/dream/qdsp5/audio_mp3.c
--- a/drivers/staging/dream/qdsp5/audio_out.c
+++ b/drivers/staging/dream/qdsp5/audio_out.c
--- a/drivers/staging/dream/qdsp5/audio_qcelp.c
+++ b/drivers/staging/dream/qdsp5/audio_qcelp.c
--- a/drivers/staging/dream/qdsp5/audmgr.c
+++ b/drivers/staging/dream/qdsp5/audmgr.c
--- a/drivers/staging/dream/qdsp5/audmgr.h
+++ b/drivers/staging/dream/qdsp5/audmgr.h
--- a/drivers/staging/dream/qdsp5/audmgr_new.h
+++ b/drivers/staging/dream/qdsp5/audmgr_new.h
--- a/drivers/staging/dream/qdsp5/audpp.c
+++ b/drivers/staging/dream/qdsp5/audpp.c
--- a/drivers/staging/dream/qdsp5/evlog.h
+++ b/drivers/staging/dream/qdsp5/evlog.h
--- a/drivers/staging/dream/qdsp5/snd.c
+++ b/drivers/staging/dream/qdsp5/snd.c
--- a/drivers/staging/dream/synaptics_i2c_rmi.c
+++ b/drivers/staging/dream/synaptics_i2c_rmi.c
--- a/drivers/staging/dream/synaptics_i2c_rmi.h
+++ b/drivers/staging/dream/synaptics_i2c_rmi.h