diff options
| author | Maximilian Attems <maks@debian.org> | 2010-02-18 13:22:31 +0000 |
|---|---|---|
| committer | Maximilian Attems <maks@debian.org> | 2010-02-18 13:22:31 +0000 |
| commit | ad46b0d34c7dc32e260f9d8ebbe4044fc71b23ae (patch) | |
| tree | 980ec35347eee27bc267b81865451b5d6c236633 /debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch | |
| parent | 3d930c037aaaaaa3761a3c7c18c32db53855fb86 (diff) | |
rebase to 2.6.33-rc8 new upstream release
fix orig generation
* rediff various staging Kconfig and firmware patches
* rt3090 is gone
nuke evident stable, stable merged, sfc features and
MODULE_FIRMWARE (hopefully all merged ;) patches.
fix speakup patch to apply to latest staging.
auffs needs newer tree and maybe we can get rid of it postsqueeze,
so didn't try at all, just nuked.
disable vserver again for now.
merged all series file into base.
TODO: still a some stray patches, but not that urgent..
svn path=/dists/trunk/linux-2.6/; revision=15185
Diffstat (limited to 'debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch')
| -rw-r--r-- | debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch b/debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch index 5adc0cd6c..db3856328 100644 --- a/debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch +++ b/debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch @@ -16,7 +16,7 @@ index fa49356..3495ff6 100644 { 0x06, 0x5561 } }; +#ifdef REMOVE_DFSG - static struct phy_reg phy_reg_init_2[] = { + static const struct phy_reg phy_reg_init_2[] = { { 0x1f, 0x0005 }, { 0x05, 0xffc2 }, @@ -2074,6 +2075,7 @@ static void rtl8168d_1_hw_phy_config(void __iomem *ioaddr) @@ -42,7 +42,7 @@ index fa49356..3495ff6 100644 { 0x06, 0x5561 } }; +#ifdef REMOVE_DFSG - static struct phy_reg phy_reg_init_1[] = { + static const struct phy_reg phy_reg_init_1[] = { { 0x1f, 0x0005 }, { 0x05, 0xffc2 }, @@ -2473,6 +2478,7 @@ static void rtl8168d_2_hw_phy_config(void __iomem *ioaddr) |