---

yaml --- r: 106347 b: refs/heads/master c: d70b67c h: refs/heads/master i: 106345: 109fbb3 106343: 0376b5d v: v3
git-mirror · Jul 27, 2008 · 55cfde4 · 55cfde4
1 parent 73048e4
commit 55cfde4
Show file tree

Hide file tree

Showing 120 changed files with 340 additions and 24,960 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c7c204aeca51ccfad63caab4fcdc5d8026c0fd8
+refs/heads/master: d70b67c8bc72ee23b55381bd6a884f4796692f77
diff --git a/trunk/Documentation/isdn/README.mISDN b/trunk/Documentation/isdn/README.mISDN
diff --git a/trunk/drivers/firmware/memmap.c b/trunk/drivers/firmware/memmap.c
@@ -153,14 +153,12 @@ int __init firmware_map_add_early(resource_size_t start, resource_size_t end,
 
 static ssize_t start_show(struct firmware_map_entry *entry, char *buf)
 {
-	return snprintf(buf, PAGE_SIZE, "0x%llx\n",
-		(unsigned long long)entry->start);
+	return snprintf(buf, PAGE_SIZE, "0x%llx\n", entry->start);
 }
 
 static ssize_t end_show(struct firmware_map_entry *entry, char *buf)
 {
-	return snprintf(buf, PAGE_SIZE, "0x%llx\n",
-		(unsigned long long)entry->end);
+	return snprintf(buf, PAGE_SIZE, "0x%llx\n", entry->end);
 }
 
 static ssize_t type_show(struct firmware_map_entry *entry, char *buf)

diff --git a/trunk/drivers/isdn/Kconfig b/trunk/drivers/isdn/Kconfig
@@ -3,7 +3,7 @@
 #
 
 menuconfig ISDN
-	bool "ISDN support"
+	tristate "ISDN support"
 	depends on NET
 	depends on !S390
 	---help---
@@ -21,8 +21,6 @@ menuconfig ISDN
 
 if ISDN
 
-source "drivers/isdn/mISDN/Kconfig"
-
 menuconfig ISDN_I4L
 	tristate "Old ISDN4Linux (deprecated)"
 	---help---

diff --git a/trunk/drivers/isdn/Makefile b/trunk/drivers/isdn/Makefile
@@ -4,7 +4,6 @@
 
 obj-$(CONFIG_ISDN_I4L)			+= i4l/
 obj-$(CONFIG_ISDN_CAPI)			+= capi/
-obj-$(CONFIG_MISDN)			+= mISDN/
 obj-$(CONFIG_ISDN_CAPI)			+= hardware/
 obj-$(CONFIG_ISDN_DIVERSION)		+= divert/
 obj-$(CONFIG_ISDN_DRV_HISAX)		+= hisax/

diff --git a/trunk/drivers/isdn/hardware/Makefile b/trunk/drivers/isdn/hardware/Makefile
@@ -4,4 +4,3 @@
 
 obj-$(CONFIG_CAPI_AVM)		+= avm/
 obj-$(CONFIG_CAPI_EICON)	+= eicon/
-obj-$(CONFIG_MISDN)		+= mISDN/
diff --git a/trunk/drivers/isdn/hardware/mISDN/Kconfig b/trunk/drivers/isdn/hardware/mISDN/Kconfig
diff --git a/trunk/drivers/isdn/hardware/mISDN/Makefile b/trunk/drivers/isdn/hardware/mISDN/Makefile
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,3 @@

		obj-$(CONFIG_CAPI_AVM) += avm/
		obj-$(CONFIG_CAPI_EICON) += eicon/
		obj-$(CONFIG_MISDN) += mISDN/