diff options
| author | Ben Hutchings <benh@debian.org> | 2012-02-19 22:01:27 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2012-02-19 22:01:27 +0000 |
| commit | b1e98ddabaa4e128fccdd5e071e92fb2d6531a8d (patch) | |
| tree | 584ea14f22e58ca98f5f0e63aca06dfe84388194 /debian/patches/debian/dfsg | |
| parent | 6ae5f75c0f78c999dd5f677a674d21a41b841e39 (diff) | |
Update to 3.3-rc4
aufs: Update to aufs3.x-rcN-20120123
rt: Disable until it is updated for Linux 3.3 or later
svn path=/dists/trunk/linux-2.6/; revision=18703
Diffstat (limited to 'debian/patches/debian/dfsg')
| -rw-r--r-- | debian/patches/debian/dfsg/files-1 | 2 | ||||
| -rw-r--r-- | debian/patches/debian/dfsg/r8192e-remove-firmware-again.patch | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches/debian/dfsg/files-1 b/debian/patches/debian/dfsg/files-1 index c8b9dbd3e..ea57287e8 100644 --- a/debian/patches/debian/dfsg/files-1 +++ b/debian/patches/debian/dfsg/files-1 @@ -18,7 +18,7 @@ rm drivers/staging/ft1000/ft1000-*/*.img rm drivers/staging/keucr/init.h -unifdef drivers/staging/rtl8192e/r8192E_hwimg.c -UREMOVE_DFSG +unifdef drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c -UREMOVE_DFSG rm drivers/staging/wlags49_h2/ap_*.c rm drivers/staging/wlags49_h2/sta_*.c diff --git a/debian/patches/debian/dfsg/r8192e-remove-firmware-again.patch b/debian/patches/debian/dfsg/r8192e-remove-firmware-again.patch index 2b7841558..ccb01385a 100644 --- a/debian/patches/debian/dfsg/r8192e-remove-firmware-again.patch +++ b/debian/patches/debian/dfsg/r8192e-remove-firmware-again.patch @@ -1,7 +1,7 @@ -diff --git a/drivers/staging/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/r8192E_firmware.c +diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c index 3771985..b073208 100644 ---- a/drivers/staging/rtl8192e/r8192E_firmware.c -+++ b/drivers/staging/rtl8192e/r8192E_firmware.c +--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c ++++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c @@ -228,13 +228,6 @@ bool init_firmware(struct net_device *dev) struct r8192_priv *priv = rtllib_priv(dev); bool rt_status = true; @@ -31,10 +31,10 @@ index 3771985..b073208 100644 default: break; -diff --git a/drivers/staging/rtl8192e/r8192E_hwimg.c b/drivers/staging/rtl8192e/r8192E_hwimg.c +diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c index 08e7dbb..e760397 100644 ---- a/drivers/staging/rtl8192e/r8192E_hwimg.c -+++ b/drivers/staging/rtl8192e/r8192E_hwimg.c +--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c ++++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c @@ -20,6 +20,7 @@ #include "r8192E_hwimg.h" |