diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 18:49:04 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 18:51:11 -0400 |
| commit | 751851af7aae9b8bd5a60b3897209081fbc18b2b (patch) | |
| tree | 5cb8dbb71d691a760da61e319796800ee42cc1c5 /drivers/atm/atmsar11.regions | |
| 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/atmsar11.regions')
| -rw-r--r-- | drivers/atm/atmsar11.regions | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/atm/atmsar11.regions b/drivers/atm/atmsar11.regions deleted file mode 100644 index 42252b7c0de3..000000000000 --- a/drivers/atm/atmsar11.regions +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | /* | ||
| 2 | See copyright and licensing conditions in ambassador.* files. | ||
| 3 | */ | ||
| 4 | { 0x00000080, 993, }, | ||
| 5 | { 0xa0d0d500, 80, }, | ||
| 6 | { 0xa0d0f000, 978, }, | ||