From dfcfaeafa2d5ef405e71035c5bc9579a18b2c16d Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Tue, 15 Apr 2008 00:30:16 -0700
Subject: [PATCH] --- yaml --- r: 90732 b: refs/heads/master c:
 31efdf0530b6351b0658d35a602a0f2d6bc2ed6f h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/isdn.h | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 10a2a65f82e3..06060e4dc237 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ef3abd2104232a35f259dad6a213310edc7c9fe
+refs/heads/master: 31efdf0530b6351b0658d35a602a0f2d6bc2ed6f
diff --git a/trunk/include/linux/isdn.h b/trunk/include/linux/isdn.h
index 9cb2855bb170..44cd663c53b6 100644
--- a/trunk/include/linux/isdn.h
+++ b/trunk/include/linux/isdn.h
@@ -16,14 +16,8 @@
 
 #include <linux/ioctl.h>
 
-#ifdef CONFIG_COBALT_MICRO_SERVER
-/* Save memory */
-#define ISDN_MAX_DRIVERS    2
-#define ISDN_MAX_CHANNELS   8
-#else
 #define ISDN_MAX_DRIVERS    32
 #define ISDN_MAX_CHANNELS   64
-#endif
 
 /* New ioctl-codes */
 #define IIOCNETAIF  _IO('I',1)