Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05668381 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

Merge branch 'master' of /home/sam/kernel/linux-2.6/

parents 34c162f7 29454dde

Documentation/DocBook/mtdnand.tmpl

+3 −3
Original line number Original line Diff line number Diff line
@@ -189,9 +189,9 @@ static unsigned long baseaddr; 
	<sect1>

	<sect1>

		<title>Partition defines</title>

		<title>Partition defines</title>

		<para>

		<para>

			If you want to divide your device into parititions, then

			If you want to divide your device into partitions, then

			enable the configuration switch CONFIG_MTD_PARITIONS and define

			enable the configuration switch CONFIG_MTD_PARTITIONS and define

			a paritioning scheme suitable to your board.

			a partitioning scheme suitable to your board.

		</para>

		</para>

		<programlisting>

		<programlisting>

#define NUM_PARTITIONS 2

#define NUM_PARTITIONS 2

Documentation/DocBook/videobook.tmpl

+1 −1
Original line number Original line Diff line number Diff line
@@ -976,7 +976,7 @@ static int camera_close(struct video_device *dev) 
  <title>Interrupt Handling</title>

  <title>Interrupt Handling</title>

  <para>

  <para>

        Our example handler is for an ISA bus device. If it was PCI you would be

        Our example handler is for an ISA bus device. If it was PCI you would be

        able to share the interrupt and would have set SA_SHIRQ to indicate a 

        able to share the interrupt and would have set IRQF_SHARED to indicate a

        shared IRQ. We pass the device pointer as the interrupt routine argument. We

        shared IRQ. We pass the device pointer as the interrupt routine argument. We

        don't need to since we only support one card but doing this will make it

        don't need to since we only support one card but doing this will make it

        easier to upgrade the driver for multiple devices in the future.

        easier to upgrade the driver for multiple devices in the future.

Documentation/arm/IXP4xx

+1 −1
Original line number Original line Diff line number Diff line
@@ -85,7 +85,7 @@ IXP4xx provides two methods of accessing PCI memory space: 
2) If > 64MB of memory space is required, the IXP4xx can be 

2) If > 64MB of memory space is required, the IXP4xx can be 

   configured to use indirect registers to access PCI This allows 

   configured to use indirect registers to access PCI This allows 

   for up to 128MB (0x48000000 to 0x4fffffff) of memory on the bus. 

   for up to 128MB (0x48000000 to 0x4fffffff) of memory on the bus. 

   The disadvantadge of this is that every PCI access requires 

   The disadvantage of this is that every PCI access requires 

   three local register accesses plus a spinlock, but in some 

   three local register accesses plus a spinlock, but in some 

   cases the performance hit is acceptable. In addition, you cannot 

   cases the performance hit is acceptable. In addition, you cannot 

   mmap() PCI devices in this case due to the indirect nature

   mmap() PCI devices in this case due to the indirect nature

Documentation/digiepca.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ NOTE: This driver is obsolete. Digi provides a 2.6 driver (dgdm) at 
http://www.digi.com for PCI cards.  They no longer maintain this driver,

http://www.digi.com for PCI cards.  They no longer maintain this driver,

and have no 2.6 driver for ISA cards.

and have no 2.6 driver for ISA cards.





This driver requires a number of user-space tools.  They can be aquired from

This driver requires a number of user-space tools.  They can be acquired from

http://www.digi.com, but only works with 2.4 kernels.

http://www.digi.com, but only works with 2.4 kernels.

Documentation/feature-removal-schedule.txt

+9 −0
Original line number Original line Diff line number Diff line
@@ -257,3 +257,12 @@ Why: Code does no longer build since at least 2.6.0, apparently there is 
Who:	Ralf Baechle <ralf@linux-mips.org>

Who:	Ralf Baechle <ralf@linux-mips.org>





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

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



What:	Interrupt only SA_* flags

When:	Januar 2007

Why:	The interrupt related SA_* flags are replaced by IRQF_* to move them

	out of the signal namespace.



Who:	Thomas Gleixner <tglx@linutronix.de>



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