diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:30:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:30:11 -0800 |
| commit | 5db5272c0a5cd37e5a697e4750fbc4ce6317b7dc (patch) | |
| tree | ebb132cbe03d613b01bea25c3c552360c8acb2ec /drivers/atm/atmdev_init.c | |
| parent | aad40ef3f2b9c4077e5a79606aed24a92ccb0406 (diff) | |
v2.4.14 -> v2.4.14.1
- me: fix page flags race condition Andrea found
- David Miller: sparc and network updates
- various: fix loop driver that thought it was part of the VM system
- me: teach DRM about VM_RESERVED
- Alan Cox: more merging
Diffstat (limited to 'drivers/atm/atmdev_init.c')
| -rw-r--r-- | drivers/atm/atmdev_init.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/atm/atmdev_init.c b/drivers/atm/atmdev_init.c index f9e350e191ba..1d554ca7d0df 100644 --- a/drivers/atm/atmdev_init.c +++ b/drivers/atm/atmdev_init.c @@ -13,6 +13,9 @@ extern int zatm_detect(void); #ifdef CONFIG_ATM_NICSTAR extern int nicstar_detect(void); #endif +#ifdef CONFIG_ATM_IDT77252 +extern int idt77252_detect(void); +#endif #ifdef CONFIG_ATM_AMBASSADOR extern int amb_detect(void); #endif @@ -47,6 +50,9 @@ int __init atmdev_init(void) #ifdef CONFIG_ATM_NICSTAR devs += nicstar_detect(); #endif +#ifdef CONFIG_ATM_IDT77252 + devs += idt77252_detect(); +#endif #ifdef CONFIG_ATM_AMBASSADOR devs += amb_detect(); #endif |