git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[pandora-kernel.git]
/
include
/
linux
/
isdn.h
diff --git
a/include/linux/isdn.h
b/include/linux/isdn.h
index
9cb2855
..
44cd663
100644
(file)
--- a/
include/linux/isdn.h
+++ b/
include/linux/isdn.h
@@
-16,14
+16,8
@@
#include <linux/ioctl.h>
#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
#define ISDN_MAX_DRIVERS 32
#define ISDN_MAX_CHANNELS 64
-#endif
/* New ioctl-codes */
#define IIOCNETAIF _IO('I',1)
/* New ioctl-codes */
#define IIOCNETAIF _IO('I',1)