diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2012-11-01 07:37:29 +0000 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2012-11-01 07:37:29 +0000 |
| commit | d6637118db9aeebbab3331d08773b07c4e8a1191 (patch) | |
| tree | 7f5abcd8975e2968c950639fb6cec99537dad210 | |
| parent | ec467f5226600a601cdae83b4dc2c4bafb85858f (diff) | |
| download | kernel-d6637118db9aeebbab3331d08773b07c4e8a1191.tar.gz kernel-d6637118db9aeebbab3331d08773b07c4e8a1191.tar.xz kernel-d6637118db9aeebbab3331d08773b07c4e8a1191.zip | |
drop upstreamed ARM omap zoom patch
| -rw-r--r-- | arm-omap-zoom2.patch | 22 | ||||
| -rw-r--r-- | kernel.spec | 2 |
2 files changed, 0 insertions, 24 deletions
diff --git a/arm-omap-zoom2.patch b/arm-omap-zoom2.patch deleted file mode 100644 index ac6357fc..00000000 --- a/arm-omap-zoom2.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c -index 677b567..1ff6bb9 100644 ---- a/sound/soc/omap/zoom2.c -+++ b/sound/soc/omap/zoom2.c -@@ -21,15 +21,14 @@ - - #include <linux/clk.h> - #include <linux/platform_device.h> -+#include <linux/gpio.h> - #include <sound/core.h> - #include <sound/pcm.h> - #include <sound/soc.h> - - #include <asm/mach-types.h> --#include <mach/hardware.h> --#include <mach/gpio.h> --#include <mach/board-zoom.h> - #include <linux/platform_data/asoc-ti-mcbsp.h> -+#include <linux/platform_data/gpio-omap.h> - - /* Register descriptions for twl4030 codec part */ - #include <linux/mfd/twl4030-audio.h> diff --git a/kernel.spec b/kernel.spec index 2c5cb598..92dee5c5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -739,7 +739,6 @@ Patch19001: i82975x-edac-fix.patch Patch21000: arm-export-read_current_timer.patch # OMAP -Patch21002: arm-omap-zoom2.patch Patch21003: arm-omapdrm-fixinc.patch # ARM tegra @@ -1337,7 +1336,6 @@ ApplyPatch vmbugon-warnon.patch # ApplyPatch arm-export-read_current_timer.patch ApplyPatch arm-omapdrm-fixinc.patch -# ApplyPatch arm-omap-zoom2.patch ApplyPatch arm-tegra-nvec-kconfig.patch ApplyPatch arm-tegra-usb-no-reset-linux33.patch ApplyPatch arm-tegra-sdhci-module-fix.patch |