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

Commit 9ab99d5a authored by Patrick McHardy's avatar Patrick McHardy
Browse files

Merge branch 'master' of /repos/git/net-next-2.6 



Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parents 76780373 b1109bf0

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ modules.builtin 
tags

TAGS

vmlinux

vmlinuz

System.map

Module.markers

Module.symvers

Documentation/DocBook/mac80211.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ usage should require reading the full document. 
        this though and the recommendation to allow only a single

        interface in STA mode at first!

      </para>

!Finclude/net/mac80211.h ieee80211_if_init_conf

!Finclude/net/mac80211.h ieee80211_vif

    </chapter>



    <chapter id="rx-tx">

Documentation/DocBook/mtdnand.tmpl

+6 −6
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ 
		</para>

		<programlisting>

static struct mtd_info *board_mtd;

static unsigned long baseaddr;

static void __iomem *baseaddr;

		</programlisting>

		<para>

			Static example
@@ -182,7 +182,7 @@ static unsigned long baseaddr; 
		<programlisting>

static struct mtd_info board_mtd;

static struct nand_chip board_chip;

static unsigned long baseaddr;

static void __iomem *baseaddr;

		</programlisting>

	</sect1>

	<sect1 id="Partition_defines">
@@ -283,7 +283,7 @@ int __init board_init (void) 
	}



	/* map physical address */

	baseaddr = (unsigned long)ioremap(CHIP_PHYSICAL_ADDRESS, 1024);

	baseaddr = ioremap(CHIP_PHYSICAL_ADDRESS, 1024);

	if (!baseaddr) {

		printk("Ioremap to access NAND chip failed\n");

		err = -EIO;
@@ -316,7 +316,7 @@ int __init board_init (void) 
	goto out;



out_ior:

	iounmap((void *)baseaddr);

	iounmap(baseaddr);

out_mtd:

	kfree (board_mtd);

out:
@@ -341,7 +341,7 @@ static void __exit board_cleanup (void) 
	nand_release (board_mtd);



	/* unmap physical address */

	iounmap((void *)baseaddr);

	iounmap(baseaddr);

	

	/* Free the MTD device structure */

	kfree (board_mtd);

Documentation/IO-mapping.txt

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ For such memory, you can do things like 
	 * access only the 640k-1MB area, so anything else

	 * has to be remapped.

	 */

	char * baseptr = ioremap(0xFC000000, 1024*1024);

	void __iomem *baseptr = ioremap(0xFC000000, 1024*1024);



	/* write a 'A' to the offset 10 of the area */

	writeb('A',baseptr+10);