Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 (33052057) · Commits · e / devices / android_kernel_teracube_emerald

Documentation/kernel-parameters.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -452,6 +452,11 @@ running once the system is up.

		eata= [HW,SCSI]

		ec_intr= [HW,ACPI] ACPI Embedded Controller interrupt mode
		Format: <int>
		0: polling mode
		non-0: interrupt mode (default)

		eda= [HW,PS2]

		edb= [HW,PS2]

+9 −1

Original line number	Diff line number	Diff line
		@@ -837,8 +837,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.

		Module for AC'97 motherboards from Intel and compatibles.
		* Intel i810/810E, i815, i820, i830, i84x, MX440
		ICH5, ICH6, ICH7, ESB2
		* SiS 7012 (SiS 735)
		* NVidia NForce, NForce2
		* NVidia NForce, NForce2, NForce3, MCP04, CK804
		CK8, CK8S, MCP501
		* AMD AMD768, AMD8111
		* ALi m5455

		@@ -868,6 +870,12 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
		--------------------

		Module for Intel ICH (i8x0) chipset MC97 modems.
		* Intel i810/810E, i815, i820, i830, i84x, MX440
		ICH5, ICH6, ICH7
		* SiS 7013 (SiS 735)
		* NVidia NForce, NForce2, NForce2s, NForce3
		* AMD AMD8111
		* ALi m5455

		ac97_clock - AC'97 codec clock base (0 = auto-detect)

+2 −2

Original line number	Diff line number	Diff line
		@@ -5206,14 +5206,14 @@ struct _snd_pcm_runtime {
		You need to pass the <function>snd_dma_pci_data(pci)</function>,
		where pci is the struct <structname>pci_dev</structname> pointer
		of the chip as well.
		The <type>snd_sg_buf_t</type> instance is created as
		The <type>struct snd_sg_buf</type> instance is created as
		substream->dma_private. You can cast
		the pointer like:

		<informalexample>
		<programlisting>
		<![CDATA[
		struct snd_sg_buf sgbuf = (struct snd_sg_buf_t)substream->dma_private;
		struct snd_sg_buf sgbuf = (struct snd_sg_buf )substream->dma_private;
		]]>
		</programlisting>
		</informalexample>

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,6 +3,6 @@ obj-$(CONFIG_X86_IO_APIC) += earlyquirk.o
		obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o

		ifneq ($(CONFIG_ACPI_PROCESSOR),)
		obj-y += cstate.o
		obj-y += cstate.o processor.o
		endif

+3 −3

Original line number	Diff line number	Diff line
		@@ -464,7 +464,7 @@ int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
		* success: return IRQ number (>=0)
		* failure: return < 0
		*/
		int acpi_register_gsi(u32 gsi, int edge_level, int active_high_low)
		int acpi_register_gsi(u32 gsi, int triggering, int polarity)
		{
		unsigned int irq;
		unsigned int plat_gsi = gsi;
		@@ -476,14 +476,14 @@ int acpi_register_gsi(u32 gsi, int edge_level, int active_high_low)
		if (acpi_irq_model == ACPI_IRQ_MODEL_PIC) {
		extern void eisa_set_level_irq(unsigned int irq);

		if (edge_level == ACPI_LEVEL_SENSITIVE)
		if (triggering == ACPI_LEVEL_SENSITIVE)
		eisa_set_level_irq(gsi);
		}
		#endif

		#ifdef CONFIG_X86_IO_APIC
		if (acpi_irq_model == ACPI_IRQ_MODEL_IOAPIC) {
		plat_gsi = mp_register_gsi(gsi, edge_level, active_high_low);
		plat_gsi = mp_register_gsi(gsi, triggering, polarity);
		}
		#endif
		acpi_gsi_to_irq(plat_gsi, &irq);