Merge remote-tracking branch 'upstream/master' into openelec-settings

packages/3rdparty/lib/ccid/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="ccid"
-PKG_VERSION="1.4.8"
+PKG_VERSION="1.4.9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://pcsclite.alioth.debian.org/ccid.html"
-PKG_URL="https://alioth.debian.org/frs/download.php/3768/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://alioth.debian.org/frs/download.php/3866/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain pcsc-lite"
 PKG_PRIORITY="optional"

packages/3rdparty/system/pcsc-lite/meta

@@ -20,12 +20,12 @@
 ################################################################################
 
 PKG_NAME="pcsc-lite"
-PKG_VERSION="1.8.7"
+PKG_VERSION="1.8.8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://pcsclite.alioth.debian.org/pcsclite.html"
-PKG_URL="https://alioth.debian.org/frs/download.php/3842/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://alioth.debian.org/frs/download.php/3862/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain libusb"
 PKG_PRIORITY="optional"

packages/addons/service/softcam/oscam/changelog.txt

@@ -1,3 +1,7 @@
+3.0.8
+- update to oscam-8469
+- update to pcsc-lite-1.8.8
+
 3.0.7
 - update to oscam-8357
 

packages/addons/service/softcam/oscam/meta

@@ -20,8 +20,8 @@
 ################################################################################
 
 PKG_NAME="oscam"
-PKG_VERSION="8357"
+PKG_VERSION="8469"
-PKG_REV="7"
+PKG_REV="8"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.streamboard.tv/oscam/wiki"

packages/addons/service/system/pcscd-addon/changelog.txt

@@ -1,3 +1,7 @@
+3.0.4
+- update to pcsc-lite-1.8.8
+- update to libccid-1.4.9
+
 3.0.3
 - update to pcsc-lite-1.8.7
 

packages/addons/service/system/pcscd-addon/meta

@@ -21,7 +21,7 @@
 
 PKG_NAME="pcscd-addon"
 PKG_VERSION="3.0"
-PKG_REV="3"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"

packages/graphics/bcm2835-driver/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="fea69f6"
+PKG_VERSION="98e5704"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"

packages/mediacenter/xbmc/patches/xbmc-990.18-PR2368.patch

@@ -0,0 +1,156 @@
+From 632825b71a2bc248eb5705666debc5f7653d6878 Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Sun, 24 Feb 2013 15:25:49 +0000
+Subject: [PATCH] [rbp] Fix for stuttery video when seeking before zero
+
+There are a few issues with seeking I found.
+We weren't correctly setting OMX_BUFFERFLAG_TIME_UNKNOWN on the first frame after a seek which could make the GPU think video was at 0 and audio at a much larger offset.
+A full video fifo (to GPU) stops any higher priority messages from being received which can stall a seek and the flush message doesn't get through. Use m_flush to discard the video packet that doesn't fit.
+We get an audio frame through with unknown pts/dts after the flush, but before the GENERAL_RESYNC when seeking. This was given to GPU and was perhaps 30 seconds out from the following packets and that throws off the timing between audio and video streams. Keeping m_flush true until the GENERAL_RESYNC discards this frame. Hopefully that is safe.
+---
+ xbmc/cores/omxplayer/OMXPlayerAudio.cpp |   13 ++-----------
+ xbmc/cores/omxplayer/OMXPlayerAudio.h   |    1 -
+ xbmc/cores/omxplayer/OMXPlayerVideo.cpp |    7 +++++++
+ xbmc/cores/omxplayer/OMXPlayerVideo.h   |    1 +
+ xbmc/cores/omxplayer/OMXVideo.cpp       |   11 +++--------
+ 5 files changed, 13 insertions(+), 20 deletions(-)
+
+diff --git a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
+index 58c3a4f..16ea6c3 100644
+--- a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
++++ b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
+@@ -369,13 +369,9 @@ bool OMXPlayerAudio::Decode(DemuxPacket *pkt, bool bDropPacket)
+ 
+       while(!m_bStop)
+       {
++        // discard if flushing as clocks may be stopped and we'll never submit it
+         if(m_flush)
+-        {
+-          CSingleLock lock(m_flushLock);
+-          m_flush = false;
+-          lock.Leave();
+           break;
+-        }
+ 
+         if(m_omxAudio.GetSpace() < (unsigned int)pkt->iSize)
+         {
+@@ -420,12 +416,7 @@ bool OMXPlayerAudio::Decode(DemuxPacket *pkt, bool bDropPacket)
+     while(!m_bStop)
+     {
+       if(m_flush)
+-      {
+-        CSingleLock lock(m_flushLock);
+-        m_flush = false;
+-        lock.Leave();
+         break;
+-      }
+ 
+       if(m_omxAudio.GetSpace() < (unsigned int)pkt->iSize)
+       {
+@@ -544,6 +535,7 @@ void OMXPlayerAudio::Process()
+       }
+       else
+         CLog::Log(LOGDEBUG, "COMXPlayerAudio - CDVDMsg::GENERAL_RESYNC(%f, 0)", m_audioClock);
++      m_flush = false;
+     }
+     else if (pMsg->IsType(CDVDMsg::GENERAL_RESET))
+     {
+@@ -627,7 +619,6 @@ void OMXPlayerAudio::Process()
+ 
+ void OMXPlayerAudio::Flush()
+ {
+-  CSingleLock lock(m_flushLock);
+   m_flush = true;
+   m_messageQueue.Flush();
+   m_messageQueue.Put( new CDVDMsg(CDVDMsg::GENERAL_FLUSH), 1);
+diff --git a/xbmc/cores/omxplayer/OMXPlayerAudio.h b/xbmc/cores/omxplayer/OMXPlayerAudio.h
+index d10133e..d6083e9 100644
+--- a/xbmc/cores/omxplayer/OMXPlayerAudio.h
++++ b/xbmc/cores/omxplayer/OMXPlayerAudio.h
+@@ -42,7 +42,6 @@
+ class OMXPlayerAudio : public CThread
+ {
+ protected:
+-  CCriticalSection      m_flushLock;
+   CDVDMessageQueue      m_messageQueue;
+   CDVDMessageQueue      &m_messageParent;
+ 
+diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
+index 5a6e31e..5dd908b 100644
+--- a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
++++ b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
+@@ -122,6 +122,7 @@ bool OMXPlayerVideo::OpenStream(CDVDStreamInfo &hints)
+   m_Deinterlace = ( g_settings.m_currentVideoSettings.m_DeinterlaceMode == VS_DEINTERLACEMODE_OFF ) ? false : true;
+   m_hdmi_clock_sync = (g_guiSettings.GetInt("videoplayer.adjustrefreshrate") != ADJUST_REFRESHRATE_OFF);
+   m_started     = false;
++  m_flush       = false;
+   m_stalled     = m_messageQueue.GetPacketCount(CDVDMsg::DEMUXER_PACKET) == 0;
+   m_autosync    = 1;
+   m_iSleepEndTime = DVD_NOPTS_VALUE;
+@@ -593,6 +594,7 @@ void OMXPlayerVideo::Process()
+       m_omxVideo.Reset();
+       m_av_clock->OMXReset(false);
+       m_av_clock->UnLock();
++      m_flush = false;
+     }
+     else if (pMsg->IsType(CDVDMsg::PLAYER_SETSPEED))
+     {
+@@ -633,6 +635,10 @@ void OMXPlayerVideo::Process()
+ 
+       while (!m_bStop)
+       {
++        // discard if flushing as clocks may be stopped and we'll never submit it
++        if (m_flush)
++           break;
++
+         if((int)m_omxVideo.GetFreeSpace() < pPacket->iSize)
+         {
+           Sleep(10);
+@@ -697,6 +703,7 @@ void OMXPlayerVideo::Process()
+ 
+ void OMXPlayerVideo::Flush()
+ {
++  m_flush = true;
+   m_messageQueue.Flush();
+   m_messageQueue.Put(new CDVDMsg(CDVDMsg::GENERAL_FLUSH), 1);
+ }
+diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.h b/xbmc/cores/omxplayer/OMXPlayerVideo.h
+index cf05c1f..7df1b0b 100644
+--- a/xbmc/cores/omxplayer/OMXPlayerVideo.h
++++ b/xbmc/cores/omxplayer/OMXPlayerVideo.h
+@@ -61,6 +61,7 @@ class OMXPlayerVideo : public CThread
+   int                       m_audio_count;
+   bool                      m_stalled;
+   bool                      m_started;
++  bool                      m_flush;
+   std::string               m_codecname;
+   double                    m_droptime;
+   double                    m_dropbase;
+diff --git a/xbmc/cores/omxplayer/OMXVideo.cpp b/xbmc/cores/omxplayer/OMXVideo.cpp
+index 3417286..4f11ff8 100644
+--- a/xbmc/cores/omxplayer/OMXVideo.cpp
++++ b/xbmc/cores/omxplayer/OMXVideo.cpp
+@@ -809,17 +809,12 @@ int COMXVideo::Decode(uint8_t *pData, int iSize, double dts, double pts)
+         // only send dts on first frame to get nearly correct starttime
+         if(pts == DVD_NOPTS_VALUE)
+           pts = dts;
+-        if(pts == DVD_NOPTS_VALUE)
+-          omx_buffer->nFlags |= OMX_BUFFERFLAG_TIME_UNKNOWN;
+-        omx_buffer->nFlags = OMX_BUFFERFLAG_STARTTIME;
++        omx_buffer->nFlags |= OMX_BUFFERFLAG_STARTTIME;
+         CLog::Log(LOGDEBUG, "OMXVideo::Decode VDec : setStartTime %f\n", (pts == DVD_NOPTS_VALUE ? 0.0 : pts) / DVD_TIME_BASE);
+         m_av_clock->VideoStart(false);
+       }
+-      else
+-      {
+-        if(pts == DVD_NOPTS_VALUE)
+-          omx_buffer->nFlags = OMX_BUFFERFLAG_TIME_UNKNOWN;
+-      }
++      if(pts == DVD_NOPTS_VALUE)
++        omx_buffer->nFlags |= OMX_BUFFERFLAG_TIME_UNKNOWN;
+ 
+       omx_buffer->nTimeStamp = ToOMXTime((uint64_t)(pts == DVD_NOPTS_VALUE) ? 0 : pts);
+       omx_buffer->nFilledLen = (demuxer_bytes > omx_buffer->nAllocLen) ? omx_buffer->nAllocLen : demuxer_bytes;
+-- 
+1.7.10
+

packages/mediacenter/xbmc/patches/xbmc-995.10-xvba_rpi_fixes-059b89b.patch

@@ -842,9 +842,9 @@ index 90f94aa..ecf4c9a 100644
      else if (pMsg->IsType(CDVDMsg::GENERAL_FLUSH)) // private message sent by (COMXPlayerVideo::Flush())
      {
 @@ -580,6 +583,7 @@ void OMXPlayerVideo::Process()
-       m_omxVideo.Reset();
        m_av_clock->OMXReset(false);
        m_av_clock->UnLock();
+       m_flush = false;
 +      g_renderManager.EnableBuffering(false);
      }
      else if (pMsg->IsType(CDVDMsg::PLAYER_SETSPEED))

packages/tools/bcm2835-bootloader/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-bootloader"
-PKG_VERSION="fea69f6"
+PKG_VERSION="98e5704"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"

packages/tools/installer/scripts/installer

@@ -50,6 +50,9 @@
 # cumulative, e.g., "\Zb\Z1" makes the following text bold (perhaps bright)
 # red. Restore normal settings with "\Zn".
 
+# disable Ctrl+C - can be very dangerous
+trap '' 2
+
 [ -f /etc/installer.conf ] && . /etc/installer.conf || exit 0
 
 dbglg() {
@@ -171,22 +174,23 @@ do_install_mbr() {
 }
 
 do_install_quick() {
-
   # show menu
     MSG_TITLE="\Z4[ QUICK INSTALL MENU ]\Zn"
     MSG_MENU="\nUse the up/down arrows to select the correct device.\n\n Please select a device:"
     MSG_CANCEL="Back"
+    DIALOG_OPTIONS="--defaultno"
 
     create_device_list
 
     dialog --colors --backtitle "$BACKTITLE" --cancel-label "$MSG_CANCEL" \
-      --title "$MSG_TITLE" --menu "$MSG_MENU" 20 50 5 \
+      $DIALOG_OPTIONS --title "$MSG_TITLE" --menu "$MSG_MENU" 20 50 5 \
       $DEVICE_LIST 2> $TMPDIR/device_for_install
 
   # now we must do everything
     case $? in
       0)
         INSTALL_DEVICE=$(cat "$TMPDIR/device_for_install")
+        INSTALL_DEVICE_FULL=$(echo $DEVICE_LIST | sed "s|.*$INSTALL_DEVICE \([^ ]*\).*|$INSTALL_DEVICE \1|")
 
         prompt_gpt
         prompt_ssh
@@ -197,6 +201,25 @@ do_install_quick() {
           EXTLINUX_SSH="ssh"
         fi
 
+        # check for confirmation (twice!)
+        MSG_TITLE="\Z1[ Confirmation before installing ]\Zn"
+        MSG_DETAIL="\nIf you continue the target disk will be wiped out:\n\n$INSTALL_DEVICE_FULL\n\n"
+        DIALOG_OPTIONS="--defaultno"
+        dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" \
+          $DIALOG_OPTIONS --yesno "$MSG_DETAIL" 0 0
+        if [ $? -ne 0 ]; then
+          menu_main
+        fi
+
+        MSG_TITLE="\Z1[ Confirmation before installing ]\Zn"
+        MSG_DETAIL="\nThis is last chance to abort the installation!\n\nIf you continue the target disk will be wiped out:\n\n$INSTALL_DEVICE_FULL\n\n\n"
+        DIALOG_OPTIONS="--defaultno"
+        dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" \
+          $DIALOG_OPTIONS --yesno "$MSG_DETAIL" 0 0
+        if [ $? -ne 0 ]; then
+          menu_main
+        fi
+
         # remove all partitions
           msg_progress_install "1" "get all partitions $INSTALL_DEVICE"
             get_partition $INSTALL_DEVICE
@@ -316,6 +339,124 @@ do_install_quick() {
     esac
 }
 
+do_install_custom() {
+  # show menu
+    MSG_TITLE="\Z4[ CUSTOM INSTALL MENU ]\Zn"
+    MSG_MENU="\nUse the up/down arrows to select the correct partition where you want to overwrite KERNEL and SYSTEM files.\n\n Please select a partition:"
+    MSG_CANCEL="Back"
+    DIALOG_OPTIONS="--defaultno"
+
+    get_device_unmount
+
+    if [ "$DEVICES" = "" ]; then
+      msg_no_device
+    fi
+
+    PARTITION_LIST=""
+    for device in $DEVICES; do
+      get_partition $device
+      for partition in $PARTITIONS; do
+        LABEL=$(tune2fs -l $device$partition | awk 'BEGIN {FS=":"} /Filesystem volume name/ {gsub(/ /,"",$2); print $2}')
+        if [ "$LABEL" = "$DISKLABEL_SYSTEM" ]; then
+          DEVICE_MODEL=$(parted -s $device -m print | grep ^$device | cut -f7 -d ":" | sed "s/;//")
+          DEVICE_SIZE=$(parted -s $device -m print | grep ^$device | cut -f2 -d ":")
+          DEVICE_NAME=$(echo $DEVICE_MODEL ${DEVICE_SIZE} | sed 's/ /_/g')
+          PARTITION_LIST="$PARTITION_LIST $device$partition $DEVICE_NAME"
+        fi
+      done
+    done
+
+    if [ "$PARTITION_LIST" = "" ]; then
+      msg_no_device
+    fi
+
+    dialog --colors --backtitle "$BACKTITLE" --cancel-label "$MSG_CANCEL" \
+      $DIALOG_OPTIONS --title "$MSG_TITLE" --menu "$MSG_MENU" 20 50 5 \
+      $PARTITION_LIST 2> $TMPDIR/device_for_install
+
+  # now we must do everything
+    case $? in
+      0)
+        INSTALL_PARTITION=$(cat "$TMPDIR/device_for_install")
+        INSTALL_PARTITION_FULL=$(echo $PARTITION_LIST | sed "s|.*$INSTALL_PARTITION \([^ ]*\).*|$INSTALL_PARTITION \1|")
+
+        # check for confirmation (twice!)
+        MSG_TITLE="\Z1[ Confirmation before copying ]\Zn"
+        MSG_DETAIL="\nIf you continue the target partition will be\noverwritten with new KERNEL and SYSTEM files:\n\n$INSTALL_PARTITION_FULL\n\n"
+        DIALOG_OPTIONS="--defaultno"
+        dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" \
+          $DIALOG_OPTIONS --yesno "$MSG_DETAIL" 0 0
+        if [ $? -ne 0 ]; then
+          menu_main
+        fi
+
+        MSG_TITLE="\Z1[ Confirmation before copying ]\Zn"
+        MSG_DETAIL="\nThis is last chance to abort the copying!\n\nIf you continue the target partition will be\noverwritten with new KERNEL and SYSTEM files:\n\n$INSTALL_PARTITION_FULL\n\n\n"
+        DIALOG_OPTIONS="--defaultno"
+        dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" \
+          $DIALOG_OPTIONS --yesno "$MSG_DETAIL" 0 0
+        if [ $? -ne 0 ]; then
+          menu_main
+        fi
+
+        # mount system partition
+          msg_progress_install "5" "creating $TMPDIR/part1"
+            mkdir -p $TMPDIR/part1 >> $LOGFILE 2>&1
+
+          msg_progress_install "10" "mounting $INSTALL_PARTITION to $TMPDIR/part1"
+            mount -t ext4 $INSTALL_PARTITION $TMPDIR/part1 >> $LOGFILE 2>&1
+
+        # check for enough target space
+          msg_progress_install "15" "checking for space on $INSTALL_PARTITION"
+
+          KERNEL_SIZE=$(stat -t /flash/KERNEL | awk '{print $2}')
+          SYSTEM_SIZE=$(stat -t /flash/SYSTEM | awk '{print $2}')
+          SRC_SIZE=$(( $KERNEL_SIZE + $SYSTEM_SIZE ))
+
+          DEST_SIZE=$(df $TMPDIR/part1 | awk '/[0-9]%/{print $4}')
+          DEST_SIZE=$(( $DEST_SIZE * 1024 ))
+          if [ -f $TMPDIR/part1/KERNEL ]; then
+            KERNEL_SIZE=$(stat -t $TMPDIR/part1/KERNEL | awk '{print $2}')
+            DEST_SIZE=$(( $DEST_SIZE + $KERNEL_SIZE ))
+          fi
+          if [ -f $TMPDIR/part1/SYSTEM ]; then
+            SYSTEM_SIZE=$(stat -t $TMPDIR/part1/SYSTEM | awk '{print $2}')
+            DEST_SIZE=$(( $DEST_SIZE + $SYSTEM_SIZE ))
+          fi
+
+          if [ $SRC_SIZE -ge $DEST_SIZE ]; then
+            umount $TMPDIR/part1 >> $LOGFILE 2>&1
+            rmdir $TMPDIR/part1 >> $LOGFILE 2>&1
+            msg_target_space
+            menu_main
+          fi
+
+        # install system files
+          msg_progress_install "20" "installing Kernel"
+            cp /flash/KERNEL $TMPDIR/part1 >> $LOGFILE 2>&1
+
+          msg_progress_install "40" "installing System"
+            cp /flash/SYSTEM $TMPDIR/part1 >> $LOGFILE 2>&1
+            sync
+
+        # umount system partition, remove mountpoint
+          msg_progress_install "95" "unmount $TMPDIR/part1"
+            umount $TMPDIR/part1 >> $LOGFILE 2>&1
+
+          msg_progress_install "100" "remove $TMPDIR/part1"
+            rmdir $TMPDIR/part1 >> $LOGFILE 2>&1
+
+        menu_main
+        ;;
+      1)
+        menu_main
+        ;;
+      255)
+        do_poweroff
+        ;;
+    esac
+}
+
 msg_not_implemented() {
   # show a dialog that this function is not yet implemented
     MSG_TITLE="\Z2[ WORK IN PROGRESS ]\Zn"
@@ -350,6 +491,16 @@ msg_no_device() {
     menu_main
 }
 
+msg_target_space() {
+  # show an error dialog for missing space
+    MSG_TITLE="\Z1[ TARGET SPACE ]\Zn"
+    MSG_INFOBOX="\nNot enough target space!\nCopying aborted.\n"
+
+    dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" --msgbox "$MSG_INFOBOX" 8 70
+
+    menu_main
+}
+
 msg_install_ready() {
   # show a dialog that we have installed
     MSG_TITLE="\Z1[ INFORMATION ]\Zn"
@@ -452,7 +603,7 @@ menu_main() {
         ITEM_MAINMENU=$(cat "$TMPDIR/mainmenu")
         case $ITEM_MAINMENU in
           1) do_install_quick; break;;
-          2) menu_custom; break;;
+          2) do_install_custom; break;;
           3) menu_setup; break;;
           4) menu_bios; break;;
           5) logfile_show; break;;
@@ -503,12 +654,6 @@ menu_bios() {
     esac
 }
 
-menu_custom() {
-  # TODO: show the installmenu
-    msg_not_implemented
-    menu_main
-}
-
 bios_backup() {
   # create a backup of the installed bios
     if [ "$BIOS_UPDATE" = "yes" -a -f "$BIOS_FILE" ]; then

projects/ARCTIC_MC/linux/linux.x86_64.conf

@@ -2218,16 +2218,16 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=m
+CONFIG_SND=y
-CONFIG_SND_TIMER=m
+CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=m
+CONFIG_SND_PCM=y
-CONFIG_SND_HWDEP=m
+CONFIG_SND_HWDEP=y
 CONFIG_SND_RAWMIDI=m
 CONFIG_SND_JACK=y
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_HRTIMER=m
+CONFIG_SND_HRTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set
@@ -2283,7 +2283,7 @@ CONFIG_SND_PCI=y
 # CONFIG_SND_ES1938 is not set
 # CONFIG_SND_ES1968 is not set
 # CONFIG_SND_FM801 is not set
-CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_INTEL=y
 CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_RECONFIG=y

projects/ATV/linux/linux.i386.conf

@@ -2169,16 +2169,16 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=m
+CONFIG_SND=y
-CONFIG_SND_TIMER=m
+CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=m
+CONFIG_SND_PCM=y
-CONFIG_SND_HWDEP=m
+CONFIG_SND_HWDEP=y
 CONFIG_SND_RAWMIDI=m
 CONFIG_SND_JACK=y
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_PCM_OSS is not set
-# CONFIG_SND_HRTIMER is not set
+CONFIG_SND_HRTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set
@@ -2236,7 +2236,7 @@ CONFIG_SND_PCI=y
 # CONFIG_SND_ES1938 is not set
 # CONFIG_SND_ES1968 is not set
 # CONFIG_SND_FM801 is not set
-CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_INTEL=y
 CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_RECONFIG=y

projects/Fusion/linux/linux.i386.conf

@@ -2446,8 +2446,8 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=m
+CONFIG_SND=y
-CONFIG_SND_TIMER=m
+CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=m
 CONFIG_SND_HWDEP=m
 CONFIG_SND_RAWMIDI=m
@@ -2455,7 +2455,7 @@ CONFIG_SND_JACK=y
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_HRTIMER=m
+CONFIG_SND_HRTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set

projects/Fusion/linux/linux.x86_64.conf

@@ -2393,8 +2393,8 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=m
+CONFIG_SND=y
-CONFIG_SND_TIMER=m
+CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=m
 CONFIG_SND_HWDEP=m
 CONFIG_SND_RAWMIDI=m
@@ -2402,7 +2402,7 @@ CONFIG_SND_JACK=y
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_HRTIMER=m
+CONFIG_SND_HRTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set

projects/Generic/linux/linux.i386.conf

@@ -2568,8 +2568,8 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=m
+CONFIG_SND=y
-CONFIG_SND_TIMER=m
+CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=m
 CONFIG_SND_HWDEP=m
 CONFIG_SND_RAWMIDI=m
@@ -2577,7 +2577,7 @@ CONFIG_SND_JACK=y
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_HRTIMER=m
+CONFIG_SND_HRTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set

projects/Generic_OSS/linux/linux.i386.conf

@@ -2571,8 +2571,8 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=m
+CONFIG_SND=y
-CONFIG_SND_TIMER=m
+CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=m
 CONFIG_SND_HWDEP=m
 CONFIG_SND_RAWMIDI=m
@@ -2580,7 +2580,7 @@ CONFIG_SND_JACK=y
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_HRTIMER=m
+CONFIG_SND_HRTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set

projects/ION/linux/linux.i386.conf

@@ -2459,8 +2459,8 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=m
+CONFIG_SND=y
-CONFIG_SND_TIMER=m
+CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=m
 CONFIG_SND_HWDEP=m
 CONFIG_SND_RAWMIDI=m
@@ -2468,7 +2468,7 @@ CONFIG_SND_JACK=y
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_HRTIMER=m
+CONFIG_SND_HRTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set

projects/ION/linux/linux.x86_64.conf

@@ -2388,8 +2388,8 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=m
+CONFIG_SND=y
-CONFIG_SND_TIMER=m
+CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=m
 CONFIG_SND_HWDEP=m
 CONFIG_SND_RAWMIDI=m
@@ -2397,7 +2397,7 @@ CONFIG_SND_JACK=y
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_HRTIMER=m
+CONFIG_SND_HRTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set

projects/Intel/linux/linux.i386.conf

@@ -2510,8 +2510,8 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=m
+CONFIG_SND=y
-CONFIG_SND_TIMER=m
+CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=m
 CONFIG_SND_HWDEP=m
 CONFIG_SND_RAWMIDI=m
@@ -2519,7 +2519,7 @@ CONFIG_SND_JACK=y
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_HRTIMER=m
+CONFIG_SND_HRTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set

projects/Intel/linux/linux.x86_64.conf

@@ -2440,8 +2440,8 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=m
+CONFIG_SND=y
-CONFIG_SND_TIMER=m
+CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=m
 CONFIG_SND_HWDEP=m
 CONFIG_SND_RAWMIDI=m
@@ -2449,7 +2449,7 @@ CONFIG_SND_JACK=y
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_HRTIMER=m
+CONFIG_SND_HRTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set

projects/Ultra/linux/linux.x86_64.conf

@@ -2214,16 +2214,16 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=m
+CONFIG_SND=y
-CONFIG_SND_TIMER=m
+CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=m
+CONFIG_SND_PCM=y
-CONFIG_SND_HWDEP=m
+CONFIG_SND_HWDEP=y
 CONFIG_SND_RAWMIDI=m
 CONFIG_SND_JACK=y
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_HRTIMER=m
+CONFIG_SND_HRTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set
@@ -2279,7 +2279,7 @@ CONFIG_SND_PCI=y
 # CONFIG_SND_ES1938 is not set
 # CONFIG_SND_ES1968 is not set
 # CONFIG_SND_FM801 is not set
-CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_INTEL=y
 CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_RECONFIG=y

projects/Virtual/linux/linux.i386.conf

@@ -2515,8 +2515,8 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=m
+CONFIG_SND=y
-CONFIG_SND_TIMER=m
+CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=m
 CONFIG_SND_HWDEP=m
 CONFIG_SND_RAWMIDI=m
@@ -2524,7 +2524,7 @@ CONFIG_SND_JACK=y
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_HRTIMER=m
+CONFIG_SND_HRTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set

projects/Virtual/linux/linux.x86_64.conf

@@ -2444,8 +2444,8 @@ CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
-CONFIG_SND=m
+CONFIG_SND=y
-CONFIG_SND_TIMER=m
+CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=m
 CONFIG_SND_HWDEP=m
 CONFIG_SND_RAWMIDI=m
@@ -2453,7 +2453,7 @@ CONFIG_SND_JACK=y
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_HRTIMER=m
+CONFIG_SND_HRTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set