Commit cb1f7be7 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6

parents 6fe43f9e bb7e257e

.gitignore

0 → 100644
+30 −0
Original line number Diff line number Diff line 
#

# NOTE! Don't add files that are generated in specific

# subdirectories here. Add them in the ".gitignore" file

# in that subdirectory instead.

#

# Normal rules

#

.*

*.o

*.a

*.s

*.ko

*.mod.c



#

# Top-level generic files

#

vmlinux*

System.map

Module.symvers



#

# Generated include files

#

include/asm

include/config

include/linux/autoconf.h

include/linux/compile.h

include/linux/version.h

arch/arm/mach-s3c2410/clock.c

+4 −1
Original line number Diff line number Diff line
@@ -98,7 +98,10 @@ struct clk *clk_get(struct device *dev, const char *id) 
	struct clk *clk = ERR_PTR(-ENOENT);

	int idno;



	idno = (dev == NULL) ? -1 : to_platform_device(dev)->id;

	if (dev == NULL || dev->bus != &platform_bus_type)

		idno = -1;

	else

		idno = to_platform_device(dev)->id;



	down(&clocks_sem);

drivers/char/.gitignore

0 → 100644
+3 −0
Original line number Diff line number Diff line 
consolemap_deftbl.c

defkeymap.c

drivers/pci/.gitignore

0 → 100644
+4 −0
Original line number Diff line number Diff line 
classlist.h

devlist.h

gen-devlist

drivers/serial/8250_pnp.c

+2 −0
Original line number Diff line number Diff line
@@ -276,6 +276,8 @@ static const struct pnp_device_id pnp_dev_table[] = { 
	{	"SUP1620",		0	},

	/* SupraExpress 33.6 Data/Fax PnP modem */

	{	"SUP1760",		0	},

	/* SupraExpress 56i Sp Intl */

	{	"SUP2171",		0	},

	/* Phoebe Micro */

	/* Phoebe Micro 33.6 Data Fax 1433VQH Plug & Play */

	{	"TEX0011",		0	},