Commit 6eaaaac9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus 

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  remove CONFIG_KMOD from core kernel code
  remove CONFIG_KMOD from lib
  remove CONFIG_KMOD from sparc64
  rework try_then_request_module to do less in non-modular kernels
  remove mention of CONFIG_KMOD from documentation
  make CONFIG_KMOD invisible
  modules: Take a shortcut for checking if an address is in a module
  module: turn longs into ints for module sizes
  Shrink struct module: CONFIG_UNUSED_SYMBOLS ifdefs
  module: reorder struct module to save space on 64 bit builds
  module: generic each_symbol iterator function
  module: don't use stop_machine for waiting rmmod
parents 06b8147c a1ef5adb

Documentation/filesystems/bfs.txt

+5 −5
Original line number Diff line number Diff line
@@ -26,11 +26,11 @@ You can simplify mounting by just typing: 


this will allocate the first available loopback device (and load loop.o 

kernel module if necessary) automatically. If the loopback driver is not

loaded automatically, make sure that your kernel is compiled with kmod 

support (CONFIG_KMOD) enabled. Beware that umount will not

deallocate /dev/loopN device if /etc/mtab file on your system is a

symbolic link to /proc/mounts. You will need to do it manually using

"-d" switch of losetup(8). Read losetup(8) manpage for more info.

loaded automatically, make sure that you have compiled the module and

that modprobe is functioning. Beware that umount will not deallocate

/dev/loopN device if /etc/mtab file on your system is a symbolic link to

/proc/mounts. You will need to do it manually using "-d" switch of

losetup(8). Read losetup(8) manpage for more info.



To create the BFS image under UnixWare you need to find out first which

slice contains it. The command prtvtoc(1M) is your friend:

Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
     <sect1><title>Device Components</title>

!Esound/core/device.c

     </sect1>

     <sect1><title>KMOD and Device File Entries</title>

     <sect1><title>Module requests and Device File Entries</title>

!Esound/core/sound.c

     </sect1>

     <sect1><title>Memory Management Helpers</title>

Documentation/telephony/ixj.txt

+3 −10
Original line number Diff line number Diff line
@@ -305,21 +305,14 @@ driver, like this: 


which will result in the needed drivers getting loaded automatically.



   g.  if you are planning on using kerneld to automatically load the 

module for you, then you need to edit /etc/conf.modules and add the 

   g.  if you are planning on having the kernel automatically request

the module for you, then you need to edit /etc/conf.modules and add the

following lines:



	options ixj dspio=0x340 xio=0x330 ixjdebug=0



If you do this, then when you execute an application that uses the

module kerneld will load the module for you.  Note that to do this,

you need to have your kernel set to support kerneld.  You can check

for this by looking at /usr/src/linux/.config and you should see this:



	# Loadable module support

	#

	<snip>

	CONFIG_KMOD=y

module the kernel will request that it is loaded.



  h.  if you want non-root users to be able to read and write to the 

ixj devices (this is a good idea!) you should do the following:

Documentation/video4linux/w9968cf.txt

+0 −3
Original line number Diff line number Diff line
@@ -193,9 +193,6 @@ Description: Automatic 'ovcamchip' module loading: 0 disabled, 1 enabled. 
		 loads that module automatically. This action is performed as

		 once soon as the 'w9968cf' module is loaded into memory.

Default:         1

Note:            The kernel must be compiled with the CONFIG_KMOD option

		 enabled for the 'ovcamchip' module to be loaded and for

		 this parameter to be present.

-------------------------------------------------------------------------------

Name:           simcams

Type:           int

arch/blackfin/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -873,8 +873,8 @@ config HOTPLUG 
	  plugged into slots found on all modern laptop computers.  Another

	  example, used on modern desktops as well as laptops, is USB.



	  Enable HOTPLUG and KMOD, and build a modular kernel.  Get agent

	  software (at <http://linux-hotplug.sourceforge.net/>) and install it.

	  Enable HOTPLUG and build a modular kernel.  Get agent software

	  (from <http://linux-hotplug.sourceforge.net/>) and install it.

	  Then your kernel will automatically call out to a user mode "policy

	  agent" (/sbin/hotplug) to load modules and set up software needed

	  to use devices as you hotplug them.

CRA Git | Maintained and supported by SUSTech CRA and CCSE