From 076b5bbcfbd06130003a76fae8658e5e2adc7914 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Tue, 18 Oct 2005 07:51:34 +0100
Subject: [PATCH] --- yaml --- r: 9992 b: refs/heads/master c:
 c086f282c01d7e5a887c3f7b190520538267f12e h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/.gitignore                    | 30 -----------------------------
 trunk/arch/arm/mach-s3c2410/clock.c |  5 ++++-
 trunk/drivers/char/.gitignore       |  3 ---
 trunk/drivers/pci/.gitignore        |  4 ----
 trunk/drivers/serial/8250_pnp.c     |  2 --
 trunk/drivers/video/logo/.gitignore |  7 -------
 trunk/lib/.gitignore                |  6 ------
 trunk/scripts/.gitignore            |  4 ----
 trunk/scripts/basic/.gitignore      |  3 ---
 trunk/scripts/kconfig/.gitignore    | 16 ---------------
 trunk/scripts/mod/.gitignore        |  4 ----
 trunk/usr/.gitignore                |  7 -------
 13 files changed, 5 insertions(+), 88 deletions(-)
 delete mode 100644 trunk/.gitignore
 delete mode 100644 trunk/drivers/char/.gitignore
 delete mode 100644 trunk/drivers/pci/.gitignore
 delete mode 100644 trunk/drivers/video/logo/.gitignore
 delete mode 100644 trunk/lib/.gitignore
 delete mode 100644 trunk/scripts/.gitignore
 delete mode 100644 trunk/scripts/basic/.gitignore
 delete mode 100644 trunk/scripts/kconfig/.gitignore
 delete mode 100644 trunk/scripts/mod/.gitignore
 delete mode 100644 trunk/usr/.gitignore

diff --git a/[refs] b/[refs]
index 4cf3b45b3a1b..7b98fd900cbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ace7c769378b9fb2f1fd2c60c04ba3591a6a5af5
+refs/heads/master: c086f282c01d7e5a887c3f7b190520538267f12e
diff --git a/trunk/.gitignore b/trunk/.gitignore
deleted file mode 100644
index 5014bfa48ac1..000000000000
--- a/trunk/.gitignore
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# 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
-
diff --git a/trunk/arch/arm/mach-s3c2410/clock.c b/trunk/arch/arm/mach-s3c2410/clock.c
index f59608268751..8b3d5dc35de5 100644
--- a/trunk/arch/arm/mach-s3c2410/clock.c
+++ b/trunk/arch/arm/mach-s3c2410/clock.c
@@ -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);
 
diff --git a/trunk/drivers/char/.gitignore b/trunk/drivers/char/.gitignore
deleted file mode 100644
index 2b6b1d772ed7..000000000000
--- a/trunk/drivers/char/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-consolemap_deftbl.c
-defkeymap.c
-
diff --git a/trunk/drivers/pci/.gitignore b/trunk/drivers/pci/.gitignore
deleted file mode 100644
index f297ca8d313e..000000000000
--- a/trunk/drivers/pci/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-classlist.h
-devlist.h
-gen-devlist
-
diff --git a/trunk/drivers/serial/8250_pnp.c b/trunk/drivers/serial/8250_pnp.c
index 5d8660a42b77..c2786fc41cc5 100644
--- a/trunk/drivers/serial/8250_pnp.c
+++ b/trunk/drivers/serial/8250_pnp.c
@@ -276,8 +276,6 @@ 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	},
diff --git a/trunk/drivers/video/logo/.gitignore b/trunk/drivers/video/logo/.gitignore
deleted file mode 100644
index e48355f538fa..000000000000
--- a/trunk/drivers/video/logo/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Generated files
-#
-*_mono.c
-*_vga16.c
-*_clut224.c
-*_gray256.c
diff --git a/trunk/lib/.gitignore b/trunk/lib/.gitignore
deleted file mode 100644
index 3bef1ea94c99..000000000000
--- a/trunk/lib/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Generated files
-#
-gen_crc32table
-crc32table.h
-
diff --git a/trunk/scripts/.gitignore b/trunk/scripts/.gitignore
deleted file mode 100644
index b46d68bb9e17..000000000000
--- a/trunk/scripts/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-conmakehash
-kallsyms
-pnmtologo
-
diff --git a/trunk/scripts/basic/.gitignore b/trunk/scripts/basic/.gitignore
deleted file mode 100644
index 7304e19782c7..000000000000
--- a/trunk/scripts/basic/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-fixdep
-split-include
-docproc
diff --git a/trunk/scripts/kconfig/.gitignore b/trunk/scripts/kconfig/.gitignore
deleted file mode 100644
index 2dac3442e0ac..000000000000
--- a/trunk/scripts/kconfig/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Generated files
-#
-config*
-lex.*.c
-*.tab.c
-*.tab.h
-
-#
-# configuration programs
-#
-conf
-mconf
-qconf
-gconf
-kxgettext
diff --git a/trunk/scripts/mod/.gitignore b/trunk/scripts/mod/.gitignore
deleted file mode 100644
index e9b7abe7b95b..000000000000
--- a/trunk/scripts/mod/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-elfconfig.h
-mk_elfconfig
-modpost
-
diff --git a/trunk/usr/.gitignore b/trunk/usr/.gitignore
deleted file mode 100644
index be186a82e8d0..000000000000
--- a/trunk/usr/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Generated files
-#
-gen_init_cpio
-initramfs_data.cpio
-initramfs_data.cpio.gz
-initramfs_list