---

yaml --- r: 9992 b: refs/heads/master c: c086f28 h: refs/heads/master v: v3
git-mirror · Oct 18, 2005 · 076b5bb · 076b5bb
1 parent c5cbf03
commit 076b5bb
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 88 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ace7c769378b9fb2f1fd2c60c04ba3591a6a5af5
+refs/heads/master: c086f282c01d7e5a887c3f7b190520538267f12e
diff --git a/trunk/.gitignore b/trunk/.gitignore
diff --git 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
diff --git a/trunk/drivers/pci/.gitignore b/trunk/drivers/pci/.gitignore
diff --git 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
diff --git a/trunk/lib/.gitignore b/trunk/lib/.gitignore
diff --git a/trunk/scripts/.gitignore b/trunk/scripts/.gitignore
diff --git a/trunk/scripts/basic/.gitignore b/trunk/scripts/basic/.gitignore
diff --git a/trunk/scripts/kconfig/.gitignore b/trunk/scripts/kconfig/.gitignore
diff --git a/trunk/scripts/mod/.gitignore b/trunk/scripts/mod/.gitignore
diff --git a/trunk/usr/.gitignore b/trunk/usr/.gitignore