diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /drivers/isdn/sc/hardware.h | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'drivers/isdn/sc/hardware.h')
| -rw-r--r-- | drivers/isdn/sc/hardware.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/sc/hardware.h b/drivers/isdn/sc/hardware.h index 9e6d5302bf8e..627324856ead 100644 --- a/drivers/isdn/sc/hardware.h +++ b/drivers/isdn/sc/hardware.h | |||
| @@ -87,7 +87,7 @@ | |||
| 87 | #define BRI_CHANNELS 2 /* Number of B channels */ | 87 | #define BRI_CHANNELS 2 /* Number of B channels */ |
| 88 | #define BRI_BASEPG_VAL 0x98 | 88 | #define BRI_BASEPG_VAL 0x98 |
| 89 | #define BRI_MAGIC 0x60000 /* Magic Number */ | 89 | #define BRI_MAGIC 0x60000 /* Magic Number */ |
| 90 | #define BRI_MEMSIZE 0x10000 /* Ammount of RAM (64K) */ | 90 | #define BRI_MEMSIZE 0x10000 /* Amount of RAM (64K) */ |
| 91 | #define BRI_PARTNO "72-029" | 91 | #define BRI_PARTNO "72-029" |
| 92 | #define BRI_FEATURES ISDN_FEATURE_L2_HDLC | ISDN_FEATURE_L3_TRANS; | 92 | #define BRI_FEATURES ISDN_FEATURE_L2_HDLC | ISDN_FEATURE_L3_TRANS; |
| 93 | /* | 93 | /* |