diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 15:49:04 -0700 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 15:51:11 -0700 |
commit | 751851af7aae9b8bd5a60b3897209081fbc18b2b (patch) | |
tree | 5cb8dbb71d691a760da61e319796800ee42cc1c5 /drivers/atm/ambassador.h | |
parent | a41eebab7537890409ea9dfe0fcda9b5fbdb090d (diff) | |
parent | d71792ac3d48df6693f7b339e02494efc27036c3 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:
sound/pci/Kconfig
Diffstat (limited to 'drivers/atm/ambassador.h')
-rw-r--r-- | drivers/atm/ambassador.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/atm/ambassador.h b/drivers/atm/ambassador.h index df55fa8387d..bd1c46a7ef4 100644 --- a/drivers/atm/ambassador.h +++ b/drivers/atm/ambassador.h @@ -656,17 +656,6 @@ typedef struct amb_dev amb_dev; #define AMB_DEV(atm_dev) ((amb_dev *) (atm_dev)->dev_data) #define AMB_VCC(atm_vcc) ((amb_vcc *) (atm_vcc)->dev_data) -/* the microcode */ - -typedef struct { - u32 start; - unsigned int count; -} region; - -static region ucode_regions[]; -static u32 ucode_data[]; -static u32 ucode_start; - /* rate rounding */ typedef enum { |