diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:43:49 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:43:49 -0400 |
| commit | 1d6ae775d7a948c9575658eb41184fd2e506c0df (patch) | |
| tree | 8128a28e89d82f13bb8e3a2160382240c66e2816 /drivers/isdn/hisax/hisax.h | |
| parent | 739cdbf1d8f0739b80035b80d69d871e33749b86 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/isdn/hisax/hisax.h')
| -rw-r--r-- | drivers/isdn/hisax/hisax.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h index 17cf7663c582..26c545fa223b 100644 --- a/drivers/isdn/hisax/hisax.h +++ b/drivers/isdn/hisax/hisax.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| 11 | #include <linux/fs.h> | 11 | #include <linux/fs.h> |
| 12 | #include <linux/major.h> | 12 | #include <linux/major.h> |
| 13 | #include <asm/segment.h> | ||
| 14 | #include <asm/io.h> | 13 | #include <asm/io.h> |
| 15 | #include <linux/delay.h> | 14 | #include <linux/delay.h> |
| 16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| @@ -1242,6 +1241,8 @@ struct IsdnCardState { | |||
| 1242 | 1241 | ||
| 1243 | #ifdef CONFIG_HISAX_ENTERNOW_PCI | 1242 | #ifdef CONFIG_HISAX_ENTERNOW_PCI |
| 1244 | #define CARD_FN_ENTERNOW_PCI 1 | 1243 | #define CARD_FN_ENTERNOW_PCI 1 |
| 1244 | #else | ||
| 1245 | #define CARD_FN_ENTERNOW_PCI 0 | ||
| 1245 | #endif | 1246 | #endif |
| 1246 | 1247 | ||
| 1247 | #define TEI_PER_CARD 1 | 1248 | #define TEI_PER_CARD 1 |